with '#' will be ignored, and an empty message aborts the commit.
Committer: Yuya ENOKIDA <enokida@cs09.lan2.yasunaga-lab.bio.kyutech.ac.jp>
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
modified: src/Objects/DataManip/mrcImage/src/mrcImageInfo.c
modified: src/Tools/Config/Define.inc
new file: src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHA
new file: src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX
new file: src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX5
new file: src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHAOSF1
new file: src/Tools/eosPoint/eosPointPositionCorrection/src/CELLLINUX64
new file: src/Tools/eosPoint/eosPointPositionCorrection/src/HP
new file: src/Tools/eosPoint/eosPointPositionCorrection/src/I386LINUX
new file: src/Tools/eosPoint/eosPointPositionCorrection/src/I686LINUX
new file: src/Tools/eosPoint/eosPointPositionCorrection/src/SGI
new file: src/Tools/eosPoint/eosPointPositionCorrection/src/SPARC
new file: src/Tools/eosPoint/eosPointPositionCorrection/src/X86LINUX64
modified: src/Tools/eosPoint/eosPointPositionCorrection/src/eosPointPositionCorrection.html
modified: src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c
modified: src/Tools/mrcImage/mrcImageInfo/src/test/Makefile
modified: src/Tools/mrcImage/mrcImageLucasKanade/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcImageLucasKanade/inc/mrcImageLucasKanade.h
modified: src/Tools/mrcImage/mrcImageLucasKanade/src/argCheck.c
modified: src/Tools/mrcImage/mrcImageLucasKanade/src/init.c
modified: src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.c
modified: src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.html
modified: src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.pane
modified: src/Tools/mrcImage/mrcImageLucasKanade/src/usage.c
tmp = *img;
tmp.HeaderAMin = Low;
tmp.HeaderAMax = High;
- nLevel = (int)((High-Low)/delta);
+ nLevel = (int)((High-Low)/delta + 1);
DEBUGPRINT3("%f %f %d\n", High, Low, nLevel);
lmrcImageHistgram3(hist, nLevel, &tmp);
}
WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
--- /dev/null
+../../../../../hostdepend/ALPHA/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHA
\ No newline at end of file
--- /dev/null
+../../../../../hostdepend/ALPHALINUX/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX
\ No newline at end of file
--- /dev/null
+../../../../../hostdepend/ALPHALINUX5/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX5
\ No newline at end of file
--- /dev/null
+../../../../../hostdepend/ALPHAOSF1/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHAOSF1
\ No newline at end of file
--- /dev/null
+../../../../../hostdepend/CELLLINUX64/src/Tools/eosPoint/eosPointPositionCorrection/src/CELLLINUX64
\ No newline at end of file
--- /dev/null
+../../../../../hostdepend/HP/src/Tools/eosPoint/eosPointPositionCorrection/src/HP
\ No newline at end of file
--- /dev/null
+../../../../../hostdepend/I386LINUX/src/Tools/eosPoint/eosPointPositionCorrection/src/I386LINUX
\ No newline at end of file
--- /dev/null
+../../../../../hostdepend/I686LINUX/src/Tools/eosPoint/eosPointPositionCorrection/src/I686LINUX
\ No newline at end of file
--- /dev/null
+../../../../../hostdepend/SGI/src/Tools/eosPoint/eosPointPositionCorrection/src/SGI
\ No newline at end of file
--- /dev/null
+../../../../../hostdepend/SPARC/src/Tools/eosPoint/eosPointPositionCorrection/src/SPARC
\ No newline at end of file
--- /dev/null
+../../../../../hostdepend/X86LINUX64/src/Tools/eosPoint/eosPointPositionCorrection/src/X86LINUX64
\ No newline at end of file
-<HTML>
-<HEAD>
-<TITLE>eosPointPositionCorrection</TITLE>
-</HEAD>
-<BODY>
-<H1>eosPointPositionCorrection</H1>
-<H2>Usage</H2>
-<PRE>
-Usage: eosPointPositionCorrection
-Options:
- [-i[nput] In (NULL ).as(inFile::eosPoint ) ] :Essential :Input:eosPoint
- [-i[nput]t[ype] InType (0 ).as(Integer ) ] :Optional :Input:eosPointMode
- [-n[umber] N (-1 ).as(Integer ) ] :Optional :Input:number of Point, n, dependent upon m=n/(n-1)/2, a point number in In
- [-o[utput] Out (stdout ).as(outFile::eosPoint ) ] :Optional :Output:eosPoint
- [-o[utput]t[ype] OutType (0 ).as(Integer ) ] :Optional :Output:eosPoint
- [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile
- [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode
------ Additional Usage -----
-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>
+/bin/bash: eosPointPositionCorrection: そのようなファイルやディレクトリはありません
}
if(info->Info) {
switch(info->mode){
- case meanOfAll:{
+ case meanOfAll: // 0
+ case meanOfCentre: // 4
+ case meanOfSparse: // 5
+ case meanOf2DEdgeY:{ // 6
DEBUGPRINT3("SizeCheck: int %d: mrcImageParaTypeIntegerCoord: %d = 3x%d \n",
sizeof(int), sizeof(mrcImageParaTypeIntegerCoord), sizeof(mrcImageParaTypeInteger));
DEBUGPRINT3("SizeCheck: info:%d Coord%d Coord.x:%d\n",
fprintf(fpt, "Sum: %15.6g\n", dat->info.mean*img->HeaderN.x*img->HeaderN.y*img->HeaderN.z);
break;
}
- case meanOfCylinderSurface:{
+ case meanOfCylinderSurface:{ //2
fprintf(fpt, "Mean:%15.6g\n", dat->info.meanOfCylinderSurface);
fprintf(fpt, "SD:%15.6g\n", dat->info.sdOfCylinderSurface);
fprintf(fpt, "SE:%15.6g\n", dat->info.seOfCylinderSurface);
break;
}
- case meanOfSphereSurface:{
+ case meanOfSphereSurface:{ // 1
fprintf(fpt, "Mean:%15.6g\n", dat->info.meanOfSphereSurface);
fprintf(fpt, "SD:%15.6g\n", dat->info.sdOfSphereSurface);
fprintf(fpt, "SE:%15.6g\n", dat->info.seOfSphereSurface);
break;
}
- case meanOfEdge:{
+ case meanOfEdge:{ // 3
fprintf(fpt, "Mean: %15.6g\n", dat->info.meanOfEdge);
fprintf(fpt, "SD: %15.6g\n", dat->info.sdOfEdge);
fprintf(fpt, "SE: %15.6g\n", dat->info.seOfEdge);
break;
}
- case RMSofAllPixels:{
+ case RMSofAllPixels:{ // 7
fprintf(fpt, "RMS: %15.6g\n", dat->info.RMS);
break;
}
- case sdOfAllAxis:{
+ case sdOfAllAxis:{ // 8
fprintf(fpt, "aveOfAllAxis: %15.6g %15.6g %15.6g\n", dat->info.aveOfAllAxis.x , dat->info.aveOfAllAxis.y, dat->info.aveOfAllAxis.z);
fprintf(fpt, "sdOfAllAxis: %15.6g %15.6g %15.6g\n", dat->info.sdOfAllAxis.x , dat->info.sdOfAllAxis.y, dat->info.sdOfAllAxis.z);
break;
../$(OSTYPE)/$(OBJECTNAME) -i data/test.roi -I -m 5
../$(OSTYPE)/$(OBJECTNAME) -i data/test.roi -I -m 6
../$(OSTYPE)/$(OBJECTNAME) -i data/test.roi -I -m 7
- ../$(OSTYPE)/$(OBJECTNAME) -i data/test.roi -H6 1 -High 256 -L 0
+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.roi -H 32 -High 255 -Low 0 -o data/test.H.out; cat data/test.H.out
+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.roi -H2 1 -High 255 -Low 0 -o data/test.H2.out; cat data/test.H2.out
+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.roi -H3 32 -High 255 -Low 0 -o data/test.H3.out; cat data/test.H3.out
+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.roi -H4 1 -High 255 -Low 0 -o data/test.H4.out; cat data/test.H4.out
+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.roi -H5 32 -High 255 -Low 0 -o data/test.H5.out; cat data/test.H5.out
+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.roi -H6 1 -High 255 -Low 0 -o data/test.H6.out; cat data/test.H6.out
@echo "----- Calc check -----"
exec2:
"-i3","-i[nput]3","InputDataFile","Optional","3","1","In3Vx","inFile::mrcImage","NULL","2","In3Vy","inFile::mrcImage","NULL","3","In3Vz","inFile::mrcImage","NULL"
"-i4","-i[nput]4","InputDataFile","Optional","3","1","In4Vx","inFile::mrcImage","NULL","2","In4Vy","inFile::mrcImage","NULL","3","In4Vz","inFile::mrcImage","NULL"
"-o","-o[utput]","OutputDataFile","Essential","3","1","outVx","outFile::mrcImage","NULL","2","outVy","outFile::mrcImage","NULL","3","outVz","outFile::mrcImage","NULL"
+"-nos","-n[umber]o[f]s[tairs]","NOS","Optional","1","1","NOS","Real","4"
+"-oSize","-o[utput]Size","Output:Chimera","Optional","1","1","Size","outFile::mrcImage","NULL"
"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
char* outVz;
FILE* fptoutVz;
+ long flagNOS;
+ float NOS;
+
+ long flagSize;
+ char* Size;
+ FILE* fptSize;
+
long flagconfigFile;
char* configFile;
FILE* fptconfigFile;
}
SBREAK;
}
+ SCASE("nos") {
+ if(i+1<argc) {
+ info->NOS = stringGetNthRealData(argv[i+1], 1, " ,");
+ i++;
+ info->flagNOS++;
+ } else {
+ usage(argv[0]);
+ exit(EXIT_FAILURE);
+ }
+ SBREAK;
+ }
+ SCASE("oSize") {
+ if(i+1<argc) {
+ info->Size = stringGetNthWord(argv[i+1], 1, " ,");
+ i++;
+ info->flagSize++;
+ } else {
+ usage(argv[0]);
+ exit(EXIT_FAILURE);
+ }
+ SBREAK;
+ }
SCASE("c") {
if(i+1<argc) {
info->configFile = stringGetNthWord(argv[i+1], 1, " ,");
info->fptoutVx = NULL; info->flagoutVx = 0;
info->fptoutVy = NULL; info->flagoutVy = 0;
info->fptoutVz = NULL; info->flagoutVz = 0;
+ info->NOS = 4; info->flagNOS = 0;
+ info->fptSize = NULL; info->flagSize = 0;
info->fptconfigFile = NULL; info->flagconfigFile = 0;
info->mode = 0; info->flagmode = 0;
}
info->fptoutVz = fileOpen(info->outVz, "w");
}
+ if(info->flagNOS) {
+ }
+
+ if(info->flagSize) {
+ info->fptSize = fileOpen(info->Size, "w");
+ }
+
if(info->flagconfigFile) {
info->fptconfigFile = fileOpen(info->configFile, "r");
}
main(int argc, char* argv[])
{
mrcImageLucasKanadeInfo info;
+
- int i;
+ int i=5;
+ //i=info.NOS;
- mrcImage InVx[4];
- mrcImage InVy[4];
- mrcImage InVz[4];
+ mrcImage InVx[i];
+ mrcImage InVy[i];
+ mrcImage InVz[i];
/*
mrcImage in1Vx, in1Vy, in1Vz;
mrcImage outVx;
mrcImage outVy;
mrcImage outVz;
-
- mrcImage tmpx[4];
- mrcImage tmpy[4];
- mrcImage tmpz[4];
+ mrcImage Size;
+
+ mrcImage tmpx[i];
+ mrcImage tmpy[i];
+ mrcImage tmpz[i];
double x,y,z;
double data1,data2,data3,data4,data5,data6;
+ double size;
init0(&info);
argCheck(&info, argc, argv);
outVx.Header = InVx[0].Header;
outVy.Header = InVx[0].Header;
outVz.Header = InVx[0].Header;
+ Size.Header = InVx[0].Header;
/*
mrcFileRead(&in1Vx, info.In1Vx, "in main", 0);
mrcInit(&outVx, NULL);
mrcInit(&outVy, NULL);
mrcInit(&outVz, NULL);
+ mrcInit(&Size, NULL);
//ピラミダルの計算(inFileList)
for(i=info.flagInVxList-1; i>0; i--){
data1 = 2 * ( data1 + data4 );
data2 = 2 * ( data2 + data5 );
data3 = 2 * ( data3 + data6 );
-
+ size = sqrt(data1*data1 + data2*data2 + data3*data3);
+
mrcPixelDataSet(&outVx, 2*x, 2*y, 2*z, data1, mrcPixelRePart);
mrcPixelDataSet(&outVy, 2*x, 2*y, 2*z, data2, mrcPixelRePart);
mrcPixelDataSet(&outVz, 2*x, 2*y, 2*z, data3, mrcPixelRePart);
+ mrcPixelDataSet(&Size, x, y, z, size, mrcPixelRePart);
+
}
}
if(info.flagoutVx){
- mrcFileWrite(&outVx, info.outVx, "in main", 0);
- mrcFileWrite(&outVy, info.outVy, "in main", 0);
- mrcFileWrite(&outVz, info.outVz, "in main", 0);
+ mrcFileWrite(&outVx, info.outVx, "in main", 0);
+ mrcFileWrite(&outVy, info.outVy, "in main", 0);
+ mrcFileWrite(&outVz, info.outVz, "in main", 0);
+ }
+
+ if(info.flagSize) {
+ mrcFileWrite(&Size, info.Size, "in main", 0);
}
return 0;
[-o[utput] outVx (NULL ).as(outFile::mrcImage )
outVy (NULL ).as(outFile::mrcImage )
outVz (NULL ).as(outFile::mrcImage ) ] :Essential :OutputDataFile
+ [-n[umber]o[f]s[tairs]NOS (4 ).as(Real ) ] :Optional :NOS
+ [-o[utput]Size Size (NULL ).as(outFile::mrcImage ) ] :Optional :Output:Chimera
[-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile
[-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode
----- Additional Usage -----
-I 1 0 0 1 0 1 -1x1+1+7 ' ' 'NULL' 'In3Vx' InputDataFile
-I 1 0 0 1 0 1 -1x1+1+9 ' ' 'NULL' 'In4Vx' InputDataFile
-I 1 0 1 1 0 1 -1x1+1+10 ' ' 'NULL' 'outVx' OutputDataFile
- -I 1 0 1 0 0 1 -1x1+1+12.000000 ' ' 'configFile' 'ConfigurationFile' c
- -i 1 0 1 0 0 -1x1+1+13.500000 0 0 0 0 0 'mode' 'Mode' m
+ -f 1 0 1 0 0 -1x1+1+12.000000 0 0 4.000000 0 0 0 'NOS' 'NOS' nos
+ -O 1 0 1 0 0 1 -1x1+1+13.500000 ' ' 'Size' 'Output:Chimera' oSize
+ -I 1 0 1 0 0 1 -1x1+1+15.000000 ' ' 'configFile' 'ConfigurationFile' c
+ -i 1 0 1 0 0 -1x1+1+16.500000 0 0 0 0 0 'mode' 'Mode' m
-E
-E
-E
fprintf(stderr, " [-i[nput]3 In3Vx (NULL ).as(inFile::mrcImage ) \n In3Vy (NULL ).as(inFile::mrcImage ) \n In3Vz (NULL ).as(inFile::mrcImage ) ] :Optional :InputDataFile\n");
fprintf(stderr, " [-i[nput]4 In4Vx (NULL ).as(inFile::mrcImage ) \n In4Vy (NULL ).as(inFile::mrcImage ) \n In4Vz (NULL ).as(inFile::mrcImage ) ] :Optional :InputDataFile\n");
fprintf(stderr, " [-o[utput] outVx (NULL ).as(outFile::mrcImage ) \n outVy (NULL ).as(outFile::mrcImage ) \n outVz (NULL ).as(outFile::mrcImage ) ] :Essential :OutputDataFile\n");
+ fprintf(stderr, " [-n[umber]o[f]s[tairs]NOS (4 ).as(Real ) ] :Optional :NOS\n");
+ fprintf(stderr, " [-o[utput]Size Size (NULL ).as(outFile::mrcImage ) ] :Optional :Output:Chimera\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
