From a35275d36dceb20b11c79e996a0fd615621cf1e9 Mon Sep 17 00:00:00 2001 From: Yuya ENOKIDA Date: Fri, 4 Mar 2022 11:33:45 +0900 Subject: [PATCH] Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. Committer: Yuya ENOKIDA 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 --- src/Objects/DataManip/mrcImage/src/mrcImageInfo.c | 2 +- src/Tools/Config/Define.inc | 5 +++ .../eosPoint/eosPointPositionCorrection/src/ALPHA | 1 + .../eosPointPositionCorrection/src/ALPHALINUX | 1 + .../eosPointPositionCorrection/src/ALPHALINUX5 | 1 + .../eosPointPositionCorrection/src/ALPHAOSF1 | 1 + .../eosPointPositionCorrection/src/CELLLINUX64 | 1 + .../eosPoint/eosPointPositionCorrection/src/HP | 1 + .../eosPointPositionCorrection/src/I386LINUX | 1 + .../eosPointPositionCorrection/src/I686LINUX | 1 + .../eosPoint/eosPointPositionCorrection/src/SGI | 1 + .../eosPoint/eosPointPositionCorrection/src/SPARC | 1 + .../eosPointPositionCorrection/src/X86LINUX64 | 1 + .../src/eosPointPositionCorrection.html | 26 +-------------- src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c | 15 +++++---- src/Tools/mrcImage/mrcImageInfo/src/test/Makefile | 7 +++- .../mrcImageLucasKanade/Config/OptionControlFile | 2 ++ .../mrcImageLucasKanade/inc/mrcImageLucasKanade.h | 7 ++++ .../mrcImage/mrcImageLucasKanade/src/argCheck.c | 22 +++++++++++++ src/Tools/mrcImage/mrcImageLucasKanade/src/init.c | 9 ++++++ .../mrcImageLucasKanade/src/mrcImageLucasKanade.c | 37 +++++++++++++++------- .../src/mrcImageLucasKanade.html | 2 ++ .../src/mrcImageLucasKanade.pane | 6 ++-- src/Tools/mrcImage/mrcImageLucasKanade/src/usage.c | 2 ++ 24 files changed, 106 insertions(+), 47 deletions(-) create mode 120000 src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHA create mode 120000 src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX create mode 120000 src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX5 create mode 120000 src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHAOSF1 create mode 120000 src/Tools/eosPoint/eosPointPositionCorrection/src/CELLLINUX64 create mode 120000 src/Tools/eosPoint/eosPointPositionCorrection/src/HP create mode 120000 src/Tools/eosPoint/eosPointPositionCorrection/src/I386LINUX create mode 120000 src/Tools/eosPoint/eosPointPositionCorrection/src/I686LINUX create mode 120000 src/Tools/eosPoint/eosPointPositionCorrection/src/SGI create mode 120000 src/Tools/eosPoint/eosPointPositionCorrection/src/SPARC create mode 120000 src/Tools/eosPoint/eosPointPositionCorrection/src/X86LINUX64 diff --git a/src/Objects/DataManip/mrcImage/src/mrcImageInfo.c b/src/Objects/DataManip/mrcImage/src/mrcImageInfo.c index 27e0fe5ab9..e44ef24088 100755 --- a/src/Objects/DataManip/mrcImage/src/mrcImageInfo.c +++ b/src/Objects/DataManip/mrcImage/src/mrcImageInfo.c @@ -443,7 +443,7 @@ lmrcImageHistgram6(double** hist, double delta, double Low, double High, mrcImag 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); } diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc index 9ee2d89475..85eb03217d 100644 --- a/src/Tools/Config/Define.inc +++ b/src/Tools/Config/Define.inc @@ -1 +1,6 @@ WORLDNAME=Tools +WORLDNAME=Tools +WORLDNAME=Tools +WORLDNAME=Tools +WORLDNAME=Tools +WORLDNAME=Tools diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHA b/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHA new file mode 120000 index 0000000000..6dd802acdf --- /dev/null +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHA @@ -0,0 +1 @@ +../../../../../hostdepend/ALPHA/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHA \ No newline at end of file diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX b/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX new file mode 120000 index 0000000000..7935f7a9b1 --- /dev/null +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX @@ -0,0 +1 @@ +../../../../../hostdepend/ALPHALINUX/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX \ No newline at end of file diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX5 b/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX5 new file mode 120000 index 0000000000..f7f657b11c --- /dev/null +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX5 @@ -0,0 +1 @@ +../../../../../hostdepend/ALPHALINUX5/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHALINUX5 \ No newline at end of file diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHAOSF1 b/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHAOSF1 new file mode 120000 index 0000000000..04210c8ef6 --- /dev/null +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHAOSF1 @@ -0,0 +1 @@ +../../../../../hostdepend/ALPHAOSF1/src/Tools/eosPoint/eosPointPositionCorrection/src/ALPHAOSF1 \ No newline at end of file diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/CELLLINUX64 b/src/Tools/eosPoint/eosPointPositionCorrection/src/CELLLINUX64 new file mode 120000 index 0000000000..fdb1343017 --- /dev/null +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/CELLLINUX64 @@ -0,0 +1 @@ +../../../../../hostdepend/CELLLINUX64/src/Tools/eosPoint/eosPointPositionCorrection/src/CELLLINUX64 \ No newline at end of file diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/HP b/src/Tools/eosPoint/eosPointPositionCorrection/src/HP new file mode 120000 index 0000000000..1502d2455e --- /dev/null +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/HP @@ -0,0 +1 @@ +../../../../../hostdepend/HP/src/Tools/eosPoint/eosPointPositionCorrection/src/HP \ No newline at end of file diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/I386LINUX b/src/Tools/eosPoint/eosPointPositionCorrection/src/I386LINUX new file mode 120000 index 0000000000..af5f928818 --- /dev/null +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/I386LINUX @@ -0,0 +1 @@ +../../../../../hostdepend/I386LINUX/src/Tools/eosPoint/eosPointPositionCorrection/src/I386LINUX \ No newline at end of file diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/I686LINUX b/src/Tools/eosPoint/eosPointPositionCorrection/src/I686LINUX new file mode 120000 index 0000000000..ec09b74fe2 --- /dev/null +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/I686LINUX @@ -0,0 +1 @@ +../../../../../hostdepend/I686LINUX/src/Tools/eosPoint/eosPointPositionCorrection/src/I686LINUX \ No newline at end of file diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/SGI b/src/Tools/eosPoint/eosPointPositionCorrection/src/SGI new file mode 120000 index 0000000000..ee220caffd --- /dev/null +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/SGI @@ -0,0 +1 @@ +../../../../../hostdepend/SGI/src/Tools/eosPoint/eosPointPositionCorrection/src/SGI \ No newline at end of file diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/SPARC b/src/Tools/eosPoint/eosPointPositionCorrection/src/SPARC new file mode 120000 index 0000000000..7abf1d2305 --- /dev/null +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/SPARC @@ -0,0 +1 @@ +../../../../../hostdepend/SPARC/src/Tools/eosPoint/eosPointPositionCorrection/src/SPARC \ No newline at end of file diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/X86LINUX64 b/src/Tools/eosPoint/eosPointPositionCorrection/src/X86LINUX64 new file mode 120000 index 0000000000..cb96709e04 --- /dev/null +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/X86LINUX64 @@ -0,0 +1 @@ +../../../../../hostdepend/X86LINUX64/src/Tools/eosPoint/eosPointPositionCorrection/src/X86LINUX64 \ No newline at end of file diff --git a/src/Tools/eosPoint/eosPointPositionCorrection/src/eosPointPositionCorrection.html b/src/Tools/eosPoint/eosPointPositionCorrection/src/eosPointPositionCorrection.html index f95744d07e..9edb8953bf 100755 --- a/src/Tools/eosPoint/eosPointPositionCorrection/src/eosPointPositionCorrection.html +++ b/src/Tools/eosPoint/eosPointPositionCorrection/src/eosPointPositionCorrection.html @@ -1,25 +1 @@ - - -eosPointPositionCorrection - - -

eosPointPositionCorrection

-

Usage

-
-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
-
- - +/bin/bash: eosPointPositionCorrection: そのようなファイルやディレクトリはありません diff --git a/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c b/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c index ed3d2ba335..ef587d037e 100755 --- a/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c +++ b/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c @@ -249,7 +249,10 @@ outputMrcImageInfo(FILE* fpt, infoDataList* dat, mrcImage* img, mrcImageInfoInfo } 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", @@ -264,29 +267,29 @@ outputMrcImageInfo(FILE* fpt, infoDataList* dat, mrcImage* img, mrcImageInfoInfo 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; diff --git a/src/Tools/mrcImage/mrcImageInfo/src/test/Makefile b/src/Tools/mrcImage/mrcImageInfo/src/test/Makefile index 1b160265de..1b306d9fd3 100755 --- a/src/Tools/mrcImage/mrcImageInfo/src/test/Makefile +++ b/src/Tools/mrcImage/mrcImageInfo/src/test/Makefile @@ -20,7 +20,12 @@ exec: ../$(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: diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageLucasKanade/Config/OptionControlFile index a6dd6f2fbd..7c6b784b7a 100755 --- a/src/Tools/mrcImage/mrcImageLucasKanade/Config/OptionControlFile +++ b/src/Tools/mrcImage/mrcImageLucasKanade/Config/OptionControlFile @@ -7,5 +7,7 @@ "-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" diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/inc/mrcImageLucasKanade.h b/src/Tools/mrcImage/mrcImageLucasKanade/inc/mrcImageLucasKanade.h index c413abb4db..577aa0e11c 100755 --- a/src/Tools/mrcImage/mrcImageLucasKanade/inc/mrcImageLucasKanade.h +++ b/src/Tools/mrcImage/mrcImageLucasKanade/inc/mrcImageLucasKanade.h @@ -103,6 +103,13 @@ typedef struct mrcImageLucasKanadeInfo { char* outVz; FILE* fptoutVz; + long flagNOS; + float NOS; + + long flagSize; + char* Size; + FILE* fptSize; + long flagconfigFile; char* configFile; FILE* fptconfigFile; diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/src/argCheck.c b/src/Tools/mrcImage/mrcImageLucasKanade/src/argCheck.c index 44ea4d502f..99192980bd 100755 --- a/src/Tools/mrcImage/mrcImageLucasKanade/src/argCheck.c +++ b/src/Tools/mrcImage/mrcImageLucasKanade/src/argCheck.c @@ -147,6 +147,28 @@ argCheck(mrcImageLucasKanadeInfo* info, int argc, char* argv[]) } SBREAK; } + SCASE("nos") { + if(i+1NOS = stringGetNthRealData(argv[i+1], 1, " ,"); + i++; + info->flagNOS++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } + SCASE("oSize") { + if(i+1Size = stringGetNthWord(argv[i+1], 1, " ,"); + i++; + info->flagSize++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } SCASE("c") { if(i+1configFile = stringGetNthWord(argv[i+1], 1, " ,"); diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/src/init.c b/src/Tools/mrcImage/mrcImageLucasKanade/src/init.c index 00c6464c0d..e1df722b69 100755 --- a/src/Tools/mrcImage/mrcImageLucasKanade/src/init.c +++ b/src/Tools/mrcImage/mrcImageLucasKanade/src/init.c @@ -33,6 +33,8 @@ init0(mrcImageLucasKanadeInfo* info) 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; } @@ -186,6 +188,13 @@ init1(mrcImageLucasKanadeInfo* info) 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"); } diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.c b/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.c index cfb74bfa8f..29aa9e7e17 100755 --- a/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.c +++ b/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.c @@ -36,12 +36,14 @@ int 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; @@ -53,13 +55,15 @@ main(int argc, char* argv[]) 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); @@ -85,6 +89,7 @@ main(int argc, char* 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); @@ -111,6 +116,7 @@ main(int argc, char* argv[]) mrcInit(&outVx, NULL); mrcInit(&outVy, NULL); mrcInit(&outVz, NULL); + mrcInit(&Size, NULL); //ピラミダルの計算(inFileList) for(i=info.flagInVxList-1; i>0; i--){ @@ -180,10 +186,13 @@ main(int argc, char* argv[]) 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); + } } @@ -409,9 +418,13 @@ main(int argc, char* argv[]) 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; diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.html b/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.html index 15658370e3..64912dd42b 100755 --- a/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.html +++ b/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.html @@ -29,6 +29,8 @@ Options: [-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 ----- diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.pane b/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.pane index 769a1ab85d..c813b39314 100755 --- a/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.pane +++ b/src/Tools/mrcImage/mrcImageLucasKanade/src/mrcImageLucasKanade.pane @@ -14,8 +14,10 @@ -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 diff --git a/src/Tools/mrcImage/mrcImageLucasKanade/src/usage.c b/src/Tools/mrcImage/mrcImageLucasKanade/src/usage.c index c9846c2b05..f8ae9c27e1 100755 --- a/src/Tools/mrcImage/mrcImageLucasKanade/src/usage.c +++ b/src/Tools/mrcImage/mrcImageLucasKanade/src/usage.c @@ -14,6 +14,8 @@ usage(char* thisProgram) 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(); -- 2.11.0