From a7d4db84e8283ceb08e5d80b178cb98e106e91b0 Mon Sep 17 00:00:00 2001 From: Takuo Yasunaga Date: Mon, 11 Apr 2022 12:16:07 +0900 Subject: [PATCH] Please enter the commit message for your changes. Lines starting 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: lib/ARM64MAC64/libEosObjects.a modified: lib/ARM64MAC64/shared/pdbTrans.sharedo modified: src/Objects/DataManip/pdbFile/src/pdbTrans.c modified: src/Tools/filter/mrc2hdf/src/mrc2hdf.c modified: src/Tools/filter/mrc2hdf/src/test/Makefile modified: src/Tools/pdbUtil/pdbMove/src/pdbMove.html Changes not staged for commit: modified: hostdepend/ARM64MAC64 (modified content) modified: include/eosMATH.h --- hostdepend/ARM64MAC64 | 2 +- lib/ARM64MAC64/libEosObjects.a | Bin 1852312 -> 1852440 bytes lib/ARM64MAC64/shared/pdbTrans.sharedo | Bin 1840 -> 1944 bytes src/Objects/DataManip/pdbFile/src/pdbTrans.c | 4 ++ src/Tools/filter/mrc2hdf/src/mrc2hdf.c | 54 +++++++++++++++++++-------- src/Tools/filter/mrc2hdf/src/test/Makefile | 21 ++++++++--- src/Tools/pdbUtil/pdbMove/src/pdbMove.html | 29 +++++++++++++- 7 files changed, 87 insertions(+), 23 deletions(-) diff --git a/hostdepend/ARM64MAC64 b/hostdepend/ARM64MAC64 index d7d0a0af3d..7c875f6f9d 160000 --- a/hostdepend/ARM64MAC64 +++ b/hostdepend/ARM64MAC64 @@ -1 +1 @@ -Subproject commit d7d0a0af3d76f7d933680dadefa4dcea06eadb83 +Subproject commit 7c875f6f9d1e61278a3839fbb3e1af4753cfb36a diff --git a/lib/ARM64MAC64/libEosObjects.a b/lib/ARM64MAC64/libEosObjects.a index c4f05a2fc3bd980be5ac79323429d977e2561266..b4d1717e3898d1764d21c497036712bd7db616cf 100644 GIT binary patch delta 13480 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 diff --git a/lib/ARM64MAC64/shared/pdbTrans.sharedo b/lib/ARM64MAC64/shared/pdbTrans.sharedo index 7de70c32650f45e4608c284d8747e911ce75fa55..9f95db390ddf3e9c4df85df0aa046df2c19b784c 100644 GIT binary patch delta 627 zcmYk2zfJ-{5XNWs4i5tIPxO#jprW}Lh=nF%afu`*7G9!8N(^VDpb+5!Ot7@%vKAB; zK7a*=)g&6Dask<{gNqIr;Xx{(O2*}Uj>I^C;jykD!=!f4uD_r6SB_Vgah znXvha()GNLqu5X*!lD;ZV>`Bw`-+GrcS~7>$OL*bL>BtQu|JmQuyAllC;^Y-nH%Db zCB!GQ#wOoo!qHl+ES@y8zm4KqqDmP|gGCV6I!giV9Ec{D>40ZHXqbfV8O(tLZ~?ql zY=aomX$7=h5T#Bdpj`*?ag{wVMYLYAu))MmDWDw%=ODm?DGLIW5gmQC&w0r*c&lyj zhHLP9{=ju@!0-4_ehN&Eo`i>H%2>WdokdlAs^UWkWj_4=jLf5#uku{!RlY#KvH)|r YO7M+1B@09>axiuyBgVEw+*rfWA8=nkQvd(} delta 553 zcmYk3F;Bu!5XbLbA65i`Vi6<`h#iQ5$Y7$0bTDx+k%7TP7m}JVFm!Nog^$qYF)%nV z_yI^5jDv|IA44}cS4|lFKiVcoh;l1$J>Mh^U4{>>4!h z%tV{;bQ^-oWG;KeIF@Jmn{SEksqElS3w9X^m1Z q_BhtJvA#y5t|$K?6W0^H(skT{7xk-A>LUFOZ!H(EsTZLh&DtM>x;d!; diff --git a/src/Objects/DataManip/pdbFile/src/pdbTrans.c b/src/Objects/DataManip/pdbFile/src/pdbTrans.c index 26dd67a359..5223212ac9 100755 --- a/src/Objects/DataManip/pdbFile/src/pdbTrans.c +++ b/src/Objects/DataManip/pdbFile/src/pdbTrans.c @@ -42,6 +42,10 @@ pdbMatrixFileWrite(FILE* fpt, Matrix3D Matrix) matrix3DFileWrite(fpt, Matrix); } +#ifndef CUDA +int __eosCuda__ = 0; +#endif + void pdbTrans(pdbFile* pdb, Matrix3D Matrix) { diff --git a/src/Tools/filter/mrc2hdf/src/mrc2hdf.c b/src/Tools/filter/mrc2hdf/src/mrc2hdf.c index 439748a8be..5617839d9b 100755 --- a/src/Tools/filter/mrc2hdf/src/mrc2hdf.c +++ b/src/Tools/filter/mrc2hdf/src/mrc2hdf.c @@ -481,37 +481,61 @@ lmrc2hdfimaris(hid_t* out, mrcImage* in, lmrc2hdfInfo* linfo, int mode) char* dsiGroupName[] = {"Channel 0", "Image", "Imaris", "ImarisDataSet", "Log", "TImeInfo"}; int dsiNGroup = 6; hid_t dsiGroupID[dsiNGroup]; + hid_t tmpdsiGroupID; for(i=0; iflagIn) { + lhdfAttributeString(dsiGroupID[0], "Name", "No"); + sprintf(stmp, "%f %f %f", linfo->inColor[0], linfo->inColor[1], linfo->inColor[2]); + lhdfAttributeString(dsiGroupID[0], "Color", stmp); + lhdfAttributeString(dsiGroupID[0], "ColorMode", "BaseColor"); + lhdfAttributeReal2String(dsiGroupID[0], "ColorOpacity", linfo->inColor[3]); + lhdfAttributeReal2String(dsiGroupID[0], "Min", in[0].HeaderAMin); + lhdfAttributeReal2String(dsiGroupID[0], "Max", in[0].HeaderAMax); + } + if(linfo->flagIn2) { + sprintf(stmp, "%s/%s", groupName[1], "Channel 1"); + tmpdsiGroupID = H5Gcreate2(*out, stmp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + lhdfAttributeString(tmpdsiGroupID, "Name", "No"); + sprintf(stmp, "%f %f %f", linfo->in2Color[0], linfo->in2Color[1], linfo->in2Color[2]); + lhdfAttributeString(tmpdsiGroupID, "Color", stmp); + lhdfAttributeString(tmpdsiGroupID, "ColorMode", "BaseColor"); + lhdfAttributeReal2String(tmpdsiGroupID, "ColorOpacity", linfo->in2Color[3]); + lhdfAttributeReal2String(tmpdsiGroupID, "Min", linfo->in2[0].HeaderAMin); + lhdfAttributeReal2String(tmpdsiGroupID, "Max", linfo->in2[0].HeaderAMax); + status = H5Gclose(tmpdsiGroupID); + } // Image lhdfAttributeString(dsiGroupID[1], "Description", "No"); lhdfAttributeString(dsiGroupID[1], "Name", "No"); lhdfAttributeInt2String(dsiGroupID[1], "Noc", 1); - lhdfAttributeReal2String(dsiGroupID[1], "ExtMin0", in[0].HeaderStartN.x*in[0].HeaderLength.x); - lhdfAttributeReal2String(dsiGroupID[1], "ExtMin1", in[0].HeaderStartN.y*in[0].HeaderLength.y); - lhdfAttributeReal2String(dsiGroupID[1], "ExtMin2", in[0].HeaderStartN.z*in[0].HeaderLength.z); - lhdfAttributeReal2String(dsiGroupID[1], "ExtMax0", (in[0].HeaderStartN.x+dims[2]-1)*in[0].HeaderLength.x); - lhdfAttributeReal2String(dsiGroupID[1], "ExtMax1", (in[0].HeaderStartN.y+dims[1]-1)*in[0].HeaderLength.y); - lhdfAttributeReal2String(dsiGroupID[1], "ExtMax2", (in[0].HeaderStartN.z+dims[0]-1)*in[0].HeaderLength.z); + /* + lhdfAttributeReal2String(dsiGroupID[1], "ExtMin0", linfo->in[0].HeaderStartN.x*linfo->in[0].HeaderLength.x); + lhdfAttributeReal2String(dsiGroupID[1], "ExtMin1", linfo->in[0].HeaderStartN.y*linfo->in[0].HeaderLength.y); + lhdfAttributeReal2String(dsiGroupID[1], "ExtMin2", linfo->in[0].HeaderStartN.z*linfo->in[0].HeaderLength.z); + lhdfAttributeReal2String(dsiGroupID[1], "ExtMax0", (linfo->in[0].HeaderStartN.x+linfo->in[0].HeaderN.x-1)*linfo->in[0].HeaderLength.x); + lhdfAttributeReal2String(dsiGroupID[1], "ExtMax1", (linfo->in[0].HeaderStartN.y+linfo->in[0].HeaderN.y-1)*linfo->in[0].HeaderLength.y); + lhdfAttributeReal2String(dsiGroupID[1], "ExtMax2", (linfo->in[0].HeaderStartN.z+linfo->in[0].HeaderN.z-1)*linfo->in[0].HeaderLength.z); + */ + lhdfAttributeReal2String(dsiGroupID[1], "ExtMin0", 0*linfo->in[0].HeaderLength.x); + lhdfAttributeReal2String(dsiGroupID[1], "ExtMin1", 0*linfo->in[0].HeaderLength.y); + lhdfAttributeReal2String(dsiGroupID[1], "ExtMin2", 0*linfo->in[0].HeaderLength.z); + lhdfAttributeReal2String(dsiGroupID[1], "ExtMax0", (0+linfo->in[0].HeaderN.x-1)*linfo->in[0].HeaderLength.x); + lhdfAttributeReal2String(dsiGroupID[1], "ExtMax1", (0+linfo->in[0].HeaderN.y-1)*linfo->in[0].HeaderLength.y); + lhdfAttributeReal2String(dsiGroupID[1], "ExtMax2", (0+linfo->in[0].HeaderN.z-1)*linfo->in[0].HeaderLength.z); if(1in[0].HeaderN.x); + lhdfAttributeInt2String(dsiGroupID[1], "Y", linfo->in[0].HeaderN.y); + lhdfAttributeInt2String(dsiGroupID[1], "Z", linfo->in[0].HeaderN.z); // Imaris lhdfAttributeString(dsiGroupID[2], "Version", "5,5"); // ImarisDataSet diff --git a/src/Tools/filter/mrc2hdf/src/test/Makefile b/src/Tools/filter/mrc2hdf/src/test/Makefile index 548ef7f6bb..5754f97b50 100755 --- a/src/Tools/filter/mrc2hdf/src/test/Makefile +++ b/src/Tools/filter/mrc2hdf/src/test/Makefile @@ -9,27 +9,36 @@ help: @echo "----- Help Message Check -----" @../$(OSTYPE)/$(OBJECTNAME) -h -exec: data/test.ims data/test2.ims data/test-5.ims data/test2-5.ims data/test4.ims +init:: + pdbMove -i data/4xvr.pdb -o data/test.pdb -GCtoOrigin + pdb2mrc -i data/test.pdb -o data/test.mrc -nx 64 -ny 64 -nz 64 -Sx -32 -Sy -32 -Sz -32 -dx 1 -dy 1 -dz 1 -sig 1.8 + +exec: data/test.ims data/test2.ims data/test-5.ims data/test2-5.ims data/test4.ims data/test2-2.ims @echo "----- Execution End -----" + ls -l data/*.ims -data/test.ims:data/test.mrc +data/test.ims:data/test.mrc ../$(OSTYPE)/$(OBJECTNAME) rm -rf data/test.ims ../$(OSTYPE)/$(OBJECTNAME) -i data/test.mrc -o data/test.ims -data/test-5.ims:data/test.mrc +data/test-5.ims:data/test.mrc ../$(OSTYPE)/$(OBJECTNAME) rm -rf data/test-5.ims ../$(OSTYPE)/$(OBJECTNAME) -i data/test.mrc -o data/test-5.ims -nres 5 -data/test2.ims:data/test.mrc +data/test2.ims:data/test.mrc ../$(OSTYPE)/$(OBJECTNAME) rm -rf data/test2.ims ../$(OSTYPE)/$(OBJECTNAME) -I data/test.lst -o data/test2.ims -data/test4.ims:data/test.mrc +data/test2-2.ims:data/test.mrc ../$(OSTYPE)/$(OBJECTNAME) + rm -rf data/test2-2.ims + ../$(OSTYPE)/$(OBJECTNAME) -I data/test.lst -I2 data/test.lst -o data/test2-2.ims + +data/test4.ims:data/test.mrc ../$(OSTYPE)/$(OBJECTNAME) rm -rf data/test4.ims ../$(OSTYPE)/$(OBJECTNAME) -I data/test4.lst -o data/test4.ims -data/test2-5.ims:data/test.mrc +data/test2-5.ims:data/test.mrc ../$(OSTYPE)/$(OBJECTNAME) rm -rf data/test2-5.ims ../$(OSTYPE)/$(OBJECTNAME) -I data/test.lst -o data/test2-5.ims -nres 4 diff --git a/src/Tools/pdbUtil/pdbMove/src/pdbMove.html b/src/Tools/pdbUtil/pdbMove/src/pdbMove.html index 9a2b54e921..4b6f1f19a8 100755 --- a/src/Tools/pdbUtil/pdbMove/src/pdbMove.html +++ b/src/Tools/pdbUtil/pdbMove/src/pdbMove.html @@ -1 +1,28 @@ -/bin/bash: pdbMove: No such file or directory + + +pdbMove + + +

pdbMove

+

Usage

+
+Usage: pdbMove
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-x                  X                   (0.0       ).as(Real                ) ] :Optional  :Move X[A]
+    [-y                  Y                   (0.0       ).as(Real                ) ] :Optional  :Move Y[A]
+    [-z                  Z                   (0.0       ).as(Real                ) ] :Optional  :Move Z[A]
+    [-originTo           toX                 (0.0       ).as(Real                ) 
+                         toY                 (0.0       ).as(Real                ) 
+                         toZ                 (0.0       ).as(Real                ) ] :Optional  :move (0,0,0) to (X,Y,Z)
+    [-toOrigin           fromX               (0.0       ).as(Real                ) 
+                         fromY               (0.0       ).as(Real                ) 
+                         fromZ               (0.0       ).as(Real                ) ] :Optional  :move (X,Y,Z) to (0,0,0)
+    [-GCtoOrigin                                                                   ] :Optional  :GC(Gravity Centre) to origin
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+
+ + -- 2.11.0