From: Takuo Yasunaga Date: Sat, 19 Nov 2022 21:42:29 +0000 (+0900) Subject: Merge remote-tracking branch 'refs/remotes/origin/master' X-Git-Tag: v2.4.18p0369 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=refs%2Ftags%2Fv2.4.18p0369;p=eos%2Fbase.git Merge remote-tracking branch 'refs/remotes/origin/master' Conflicts: src/Tools/Integration/imagesView/src/imagesView.html src/Tools/llData/llDataPrint/src/llDataPrint.html src/Tools/mrcImage/mrcImageConvolution/src/mrcImageConvolution.html src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.html src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html src/Tools/pdbUtil/pdbRotation/src/pdbRotation.html src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html It looks like you may be committing a merge. If this is not correct, please remove the file .git/MERGE_HEAD and try again. 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 and 'origin/master' have diverged, and have 4 and 2 different commits each, respectively. (use "git pull" to merge the remote branch into yours) All conflicts fixed but you are still merging. Changes to be committed: modified: src/Tools/Integration/imagesView/src/imagesView.html modified: src/Tools/llData/llDataPrint/src/llDataPrint.html modified: src/Tools/mrcImage/mrcImageConvolution/src/mrcImageConvolution.html modified: src/Tools/mrcImage/mrcImageNormalizing/src/mrcImageNormalizing.html modified: src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html modified: src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.html modified: src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html modified: src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html modified: src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html modified: src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html modified: src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html modified: src/Tools/pdbUtil/pdbRotation/src/pdbRotation.html modified: src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html modified: src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html --- d07db608913125f6b2e97c2934488101fcf2de09 diff --cc src/Tools/Integration/imagesView/src/imagesView.html index 59026b886e,b32a1ae252..4b45573f6e --- a/src/Tools/Integration/imagesView/src/imagesView.html +++ b/src/Tools/Integration/imagesView/src/imagesView.html @@@ -1,3 -1,4 +1,7 @@@ + <<<<<<< HEAD ++======= ++<<<<<<< HEAD ++>>>>>>> refs/remotes/origin/master imagesView @@@ -17,3 -18,6 +21,9 @@@ This command for viewing images with a ++<<<<<<< HEAD ++======= + ======= + /bin/bash: imagesView: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/llData/llDataPrint/src/llDataPrint.html index 9aece68ffd,97faa43cce..19fe97ffbf --- a/src/Tools/llData/llDataPrint/src/llDataPrint.html +++ b/src/Tools/llData/llDataPrint/src/llDataPrint.html @@@ -1,3 -1,4 +1,7 @@@ + <<<<<<< HEAD ++======= ++<<<<<<< HEAD ++>>>>>>> refs/remotes/origin/master llDataPrint @@@ -20,3 -21,6 +24,9 @@@ Options ++<<<<<<< HEAD ++======= + ======= + /bin/bash: llDataPrint: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/mrcImage/mrcImageConvolution/src/mrcImageConvolution.html index 66d3381856,69f0ce0991..497868484c --- a/src/Tools/mrcImage/mrcImageConvolution/src/mrcImageConvolution.html +++ b/src/Tools/mrcImage/mrcImageConvolution/src/mrcImageConvolution.html @@@ -1,1 -1,34 +1,38 @@@ + <<<<<<< HEAD +/bin/bash: mrcImageConvolution: そのようなファイルやディレクトリはありません ++======= ++<<<<<<< HEAD + + + mrcImageConvolution + + +

mrcImageConvolution

+

Usage

+ 
+ Usage: mrcImageConvolution
+ Options:
+     [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :Input: mrcImage
+     [-i[nput]k[ernal]a[rray]InKernelArray       (NULL      ).as(inFile              ) ] :Optional  :Input: Array
+     [-i[nput]k[ernal]m[rc]InKernelMRC         (NULL      ).as(inFile              ) ] :Optional  :Input: mrcImage
+     [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+     [-times              times               (1         ).as(Integer             ) ] :Optional  :Repeat time
+     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+ ----- Additional Usage -----
+ >>> Array Format under Eos. 'nvalue' indicates the number of values in one line, in usual case, nvalue=N0. If so, you need not define nvalue.<<<<
+ ndim N0 N1 N2 ... [nvalue]
+ data(0,   0,   0,...,        0) data(1,   0,   0,...,        0) data(2,   0,   0,...,        0) ... data(N0-1,   0,   0,...,        0)
+ data(0,   1,   0,...,        0) data(1,   1,   0,...,        0) data(2,   1,   0,...,        0) ... data(N0-1,   1,   0,...,        0)
+ ..............................................................
+ data(0,N1-1,   0,...,        0) data(1,N1-1,   0,...,        0) data(2,N1-1,   0,...,        0) ... data(N0-1,N1-1,   0,...,        0)
+ data(0,   0,   1,...,        0) data(1,   0,   1,...,        0) data(2,   0,   1,...,        0) ... data(N0-1,   0,   1,...,        0)
+ ..............................................................
+ data(0,N1-1,N2-1,...,Nndim-1-1) data(1,N1-1,N2-1,...,Nndim-1-1) data(2,N1-1,N2-1,...,Nndim-1-1) ... data(N0-1,N1-1,N2-1,...,Nndim-1-1)
+
+ + + ======= + /bin/bash: mrcImageConvolution: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html index a4a042bcaf,3e7ed46f84..6db5fbdc53 --- a/src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html +++ b/src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html @@@ -1,1 -1,5 +1,9 @@@ + <<<<<<< HEAD /bin/bash: pdb2mrc2d: そのようなファイルやディレクトリはありません + ======= ++<<<<<<< HEAD ++/bin/bash: pdb2mrc2d: そのようなファイルやディレクトリはありません ++======= + /bin/bash: pdb2mrc2d: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.html index 8c39a09cd0,07dd1f6b2f..3c06557e82 --- a/src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.html +++ b/src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.html @@@ -1,1 -1,5 +1,9 @@@ + <<<<<<< HEAD /bin/bash: pdb2mrc2dWithCTF: そのようなファイルやディレクトリはありません + ======= ++<<<<<<< HEAD ++/bin/bash: pdb2mrc2dWithCTF: そのようなファイルやディレクトリはありません ++======= + /bin/bash: pdb2mrc2dWithCTF: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html index d9a63fd950,4b1a4aea24..e1887bb053 --- a/src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html +++ b/src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html @@@ -1,1 -1,5 +1,9 @@@ + <<<<<<< HEAD /bin/bash: pdbChargeFit: そのようなファイルやディレクトリはありません + ======= ++<<<<<<< HEAD ++/bin/bash: pdbChargeFit: そのようなファイルやディレクトリはありません ++======= + /bin/bash: pdbChargeFit: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html index c37d61aed7,881c1f9d83..c7a3ad04cb --- a/src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html +++ b/src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html @@@ -1,1 -1,5 +1,9 @@@ + <<<<<<< HEAD /bin/bash: pdbCrystalCreate: そのようなファイルやディレクトリはありません + ======= ++<<<<<<< HEAD ++/bin/bash: pdbCrystalCreate: そのようなファイルやディレクトリはありません ++======= + /bin/bash: pdbCrystalCreate: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html index a4548c83da,16776c5194..f72610ea89 --- a/src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html +++ b/src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html @@@ -1,1 -1,5 +1,9 @@@ + <<<<<<< HEAD /bin/bash: pdbHelix: そのようなファイルやディレクトリはありません + ======= ++<<<<<<< HEAD ++/bin/bash: pdbHelix: そのようなファイルやディレクトリはありません ++======= + /bin/bash: pdbHelix: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html index ebfde53189,1d5492a807..f0f8f4494b --- a/src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html +++ b/src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html @@@ -1,1 -1,5 +1,9 @@@ + <<<<<<< HEAD /bin/bash: pdbMatrixCreate: そのようなファイルやディレクトリはありません + ======= ++<<<<<<< HEAD ++/bin/bash: pdbMatrixCreate: そのようなファイルやディレクトリはありません ++======= + /bin/bash: pdbMatrixCreate: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html index 420bcc5fad,2058159545..8886a78426 --- a/src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html +++ b/src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html @@@ -1,1 -1,5 +1,9 @@@ + <<<<<<< HEAD /bin/bash: pdbPCA: そのようなファイルやディレクトリはありません + ======= ++<<<<<<< HEAD ++/bin/bash: pdbPCA: そのようなファイルやディレクトリはありません ++======= + /bin/bash: pdbPCA: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/pdbUtil/pdbRotation/src/pdbRotation.html index ba95de87b5,1032604e13..d6ed1ed8da --- a/src/Tools/pdbUtil/pdbRotation/src/pdbRotation.html +++ b/src/Tools/pdbUtil/pdbRotation/src/pdbRotation.html @@@ -1,1 -1,5 +1,9 @@@ + <<<<<<< HEAD /bin/bash: pdbRotation: そのようなファイルやディレクトリはありません + ======= ++<<<<<<< HEAD ++/bin/bash: pdbRotation: そのようなファイルやディレクトリはありません ++======= + /bin/bash: pdbRotation: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html index 1c28df4af8,c60c502093..253d0ad00c --- a/src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html +++ b/src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html @@@ -1,1 -1,5 +1,9 @@@ + <<<<<<< HEAD /bin/bash: pdbShapeFit: そのようなファイルやディレクトリはありません + ======= ++<<<<<<< HEAD ++/bin/bash: pdbShapeFit: そのようなファイルやディレクトリはありません ++======= + /bin/bash: pdbShapeFit: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master diff --cc src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html index 71873eb77a,d4170f00b7..43060c1962 --- a/src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html +++ b/src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html @@@ -1,1 -1,5 +1,9 @@@ + <<<<<<< HEAD /bin/bash: pdbTwoProteinFit: そのようなファイルやディレクトリはありません + ======= ++<<<<<<< HEAD ++/bin/bash: pdbTwoProteinFit: そのようなファイルやディレクトリはありません ++======= + /bin/bash: pdbTwoProteinFit: No such file or directory + >>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa ++>>>>>>> refs/remotes/origin/master