with '#' will be ignored, and an empty message aborts the commit.
On branch master
Your branch is up to date with 'origin/master'.
Changes to be committed:
modified: hostdepend/ARM64MAC64
modified: src/Tools/Config/Define.inc
modified: src/Tools/eosPoint/eosPointRotation/src/eosPointRotation.c
modified: src/Tools/eosPoint/eosPointRotation/src/eosPointRotation.html
modified: src/Tools/mrcImage/mrcImageAbnormalValueRemove/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcImageAbnormalValueRemove/inc/mrcImageAbnormalValueRemove.h
modified: src/Tools/mrcImage/mrcImageAbnormalValueRemove/src/argCheck.c
modified: src/Tools/mrcImage/mrcImageAbnormalValueRemove/src/init.c
modified: src/Tools/mrcImage/mrcImageAbnormalValueRemove/src/mrcImageAbnormalValueRemove.pane
modified: src/Tools/mrcImage/mrcImageAbnormalValueRemove/src/usage.c
Changes not staged for commit:
modified: hostdepend/ARM64MAC64 (new commits)
modified: include/eosMATH.h
-Subproject commit 7e91a5ade1e8d1cbb055de20cc8aea309784296f
+Subproject commit 986f4c3f2247fba3f8f8855a2b2ef271c145dfd3
WORLDNAME=Tools
WORLDNAME=Tools
WORLDNAME=Tools
+WORLDNAME=Tools
#define DEBUG
#include "genUtil.h"
-#include "String.h"
+#include "eosString.h"
#include "Matrix3D.h"
#include "Memory.h"
#include "eosPoint.h"
-/bin/bash: eosPointRotation: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>eosPointRotation</TITLE>
+</HEAD>
+<BODY>
+<H1>eosPointRotation</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: eosPointRotation
+Options:
+ [-i[nput] In (stdin ).as(inFile::ASCII ) ] :Optional :Input: eosPoint
+ [-i[nput]t[ype] InType (3 ).as(Integer ) ] :Optional :Input: eosPointType
+ [-o[utput] Out (stdout ).as(outFile::ASCII ) ] :Optional :Output: eosPoint
+ [-o[utput]t[ype] OutType (3 ).as(Integer ) ] :Optional :Input: eosPointType
+ [-E[uler]A[ngle] EAMode (YOYS ).as(String )
+ Rot1 (0.0 ).as(Real )
+ Rot2 (0.0 ).as(Real )
+ Rot3 (0.0 ).as(Real ) ] :Optional :Input: EulerAngleMode Rot1 Rot2 Rot3
+ [-I[nput] InList (NULL ).as(inFileList::ASCII ) ] :Optional :Input: eosPointFileList
+ [-O[uput] OutList (NULL ).as(outFileList::ASCII ) ] :Optional :Output: eosPointFileList
+ [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile
+ [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode
+----- Additional Usage -----
+>> eosPointFileType
+type-0: x y z
+type-1: x y z sig
+type-2: x y z sigx sigy sigz
+type-3: x y z sig sigx sigy sigz
+</PRE>
+</BODY>
+</HTML>
"-o","-o[utput]","Output: mrc","Essential","1","1","Out","outFile","NULL"
"-v","-v[alueForCut]","CutValue/Sigma","Optional","1","1","cutValue","Real","3.0"
"-u","-u[nsigned]","Unsigned to Signed: Need Max","Optional","2","1","UnsignedMax","Real","65535","2","UnsignedHalf","Real","16384"
+"-range","-range","Test Range(%): Histogram","Optional","2","1","rangeMin","Real","0","2","rangeMax","Real","100"
"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
long flagUnsignedHalf;
float UnsignedHalf;
+ long flagrangeMin;
+ float rangeMin;
+
+ long flagrangeMax;
+ float rangeMax;
+
long flagconfigFile;
char* configFile;
FILE* fptconfigFile;
}
SBREAK;
}
+ SCASE("range") {
+ if(i+2<argc) {
+ info->rangeMin = stringGetNthRealData(argv[i+1], 1, " ,");
+ i++;
+ info->flagrangeMin++;
+ info->rangeMax = stringGetNthRealData(argv[i+1], 1, " ,");
+ i++;
+ info->flagrangeMax++;
+ } else {
+ usage(argv[0]);
+ exit(EXIT_FAILURE);
+ }
+ SBREAK;
+ }
SCASE("c") {
if(i+1<argc) {
info->configFile = stringGetNthWord(argv[i+1], 1, " ,");
info->cutValue = 3.0; info->flagcutValue = 0;
info->UnsignedMax = 65535; info->flagUnsignedMax = 0;
info->UnsignedHalf = 16384; info->flagUnsignedHalf = 0;
+ info->rangeMin = 0; info->flagrangeMin = 0;
+ info->rangeMax = 100; info->flagrangeMax = 0;
info->fptconfigFile = NULL; info->flagconfigFile = 0;
info->mode = 0; info->flagmode = 0;
}
if(info->flagUnsignedHalf) {
}
+ if(info->flagrangeMin) {
+ }
+
+ if(info->flagrangeMax) {
+ }
+
if(info->flagconfigFile) {
info->fptconfigFile = fileOpen(info->configFile, "r");
}
-O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'Output: mrc' o
-f 1 0 1 0 0 -1x1+1+4.500000 0 0 3.000000 0 0 0 'cutValue' 'CutValue/Sigma' v
-I 1 0 0 1 0 1 -1x1+1+6 ' ' '65535' 'UnsignedMax' Unsigned to Signed: Need Max
- -I 1 0 1 0 0 1 -1x1+1+7.500000 ' ' 'configFile' 'ConfigurationFile' c
- -i 1 0 1 0 0 -1x1+1+9.000000 0 0 0 0 0 'mode' 'Mode' m
+ -I 1 0 0 1 0 1 -1x1+1+7 ' ' '0' 'rangeMin' Test Range(%): Histogram
+ -I 1 0 1 0 0 1 -1x1+1+9.000000 ' ' 'configFile' 'ConfigurationFile' c
+ -i 1 0 1 0 0 -1x1+1+10.500000 0 0 0 0 0 'mode' 'Mode' m
-E
-E
-E
fprintf(stderr, " [-o[utput] Out (NULL ).as(outFile ) ] :Essential :Output: mrc\n");
fprintf(stderr, " [-v[alueForCut] cutValue (3.0 ).as(Real ) ] :Optional :CutValue/Sigma\n");
fprintf(stderr, " [-u[nsigned] UnsignedMax (65535 ).as(Real ) \n UnsignedHalf (16384 ).as(Real ) ] :Optional :Unsigned to Signed: Need Max\n");
+ fprintf(stderr, " [-range rangeMin (0 ).as(Real ) \n rangeMax (100 ).as(Real ) ] :Optional :Test Range(%): Histogram\n");
fprintf(stderr, " [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile\n");
fprintf(stderr, " [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode\n");
additionalUsage();
OSDN Git Service
