OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

base: Commit

This repository is a base of Eos.


Commit MetaInfo

Revisionbc756e6030630eda7494c7aad122bbb7a05da167 (tree)
Zeit2019-03-18 12:40:53
Autor安永卓生 <tacyas@yasu...>
Commiter安永卓生

Log Message

Merge branch 'master' of git.osdn.jp:/gitroot/eos/base

Conflicts:

lib/tclIndex

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.
Committer: 安永卓生 <tacyas@yasunagatakuonoMacBook-Pro.local>
On branch master
Your branch and 'origin/master' have diverged,
and have 1 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: env/Eos_env
modified: lib/tclIndex
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMasking.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMasking.h
modified: src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/Makefile

Ändern Zusammenfassung

Diff

--- a/env/Eos_env
+++ b/env/Eos_env
@@ -416,7 +416,7 @@ fi
416416 #ICC
417417 #ICC_ROOT=/opt/intel/Compiler/11.1/072
418418 ICC_ROOT=/opt/intel/
419-if [ -d $ICC_ROOT -a -f $ICC_ROOT/bin/icc ] ; then
419+if [ -d $ICC_ROOT ] && [ -f $ICC_ROOT/bin/icc ] && [ $USE_ICC ] ; then
420420 DIRNAMES=$ICC_ROOT/bin
421421 #echo $HOSTTYPE
422422 case $HOSTTYPE in
--- a/lib/tclIndex
+++ b/lib/tclIndex
@@ -1,141 +0,0 @@
1-# Tcl autoload index file, version 2.0
2-# This file is generated by the "auto_mkindex" command
3-# and sourced to set up indexing information for one or
4-# more commands. Typically each line is a command that
5-# sets an element in the auto_index array, where the
6-# element name is the name of a command and the value is
7-# a script that loads the command.
8-
9-set auto_index(NotSupportedCommand) [list source [file join $dir tclUtil.wish]]
10-set auto_index(debugPrint) [list source [file join $dir tclUtil.wish]]
11-set auto_index(fileSelect) [list source [file join $dir fileSelect.wish]]
12-set auto_index(fileSelectResources) [list source [file join $dir fileSelect.wish]]
13-set auto_index(fileSelectBindings) [list source [file join $dir fileSelect.wish]]
14-set auto_index(fileSelectList) [list source [file join $dir fileSelect.wish]]
15-set auto_index(fileSelectOK) [list source [file join $dir fileSelect.wish]]
16-set auto_index(fileSelectCancel) [list source [file join $dir fileSelect.wish]]
17-set auto_index(fileSelectClick) [list source [file join $dir fileSelect.wish]]
18-set auto_index(fileSelectTake) [list source [file join $dir fileSelect.wish]]
19-set auto_index(fileSelectComplete) [list source [file join $dir fileSelect.wish]]
20-set auto_index(fileCanBeOverwritten) [list source [file join $dir fileUtil.wish]]
21-set auto_index(relativePathGet) [list source [file join $dir fileUtil.wish]]
22-set auto_index(CommandEntry) [list source [file join $dir CommandEntry.wish]]
23-set auto_index(CommandEntryWithSelection) [list source [file join $dir CommandEntry.wish]]
24-set auto_index(CommandEntryWithSelectionEntrySet) [list source [file join $dir CommandEntry.wish]]
25-set auto_index(CommandEntryWithUpDown) [list source [file join $dir CommandEntry.wish]]
26-set auto_index(CommandEntryWithUpDownUp) [list source [file join $dir CommandEntry.wish]]
27-set auto_index(CommandEntryWithUpDownDown) [list source [file join $dir CommandEntry.wish]]
28-set auto_index(::CTF::Init) [list source [file join $dir ctfInfo.wish]]
29-set auto_index(::CTF::Win) [list source [file join $dir ctfInfo.wish]]
30-set auto_index(::CTF::ctfInfoGraphInfoFrameCreate) [list source [file join $dir ctfInfo.wish]]
31-set auto_index(::CTF::ctfInfoGraphInfoFrameCreate1) [list source [file join $dir ctfInfo.wish]]
32-set auto_index(::CTF::ctfInfoGraphInfoFrameCreate2) [list source [file join $dir ctfInfo.wish]]
33-set auto_index(::CTF::ctfInfoSaveAsPS) [list source [file join $dir ctfInfo.wish]]
34-set auto_index(::CTF::ctfInfoSave) [list source [file join $dir ctfInfo.wish]]
35-set auto_index(::CTF::ctfInfoLoad) [list source [file join $dir ctfInfo.wish]]
36-set auto_index(::CTF::ctfInfoMolecEnvSet) [list source [file join $dir ctfInfo.wish]]
37-set auto_index(::CTF::ctfInfoCTFInfoFrameCreate) [list source [file join $dir ctfInfo.wish]]
38-set auto_index(::CTF::ctfInfoCTFInfoFrameCreate1) [list source [file join $dir ctfInfo.wish]]
39-set auto_index(::CTF::ctfInitSearch) [list source [file join $dir ctfInfo.wish]]
40-set auto_index(::CTF::ctfFineTuning) [list source [file join $dir ctfInfo.wish]]
41-set auto_index(::CTF::ctfInfoCTFInfoFrameCreate2) [list source [file join $dir ctfInfo.wish]]
42-set auto_index(::CTF::ctfInfoMarkerSet) [list source [file join $dir ctfInfo.wish]]
43-set auto_index(::CTF::ctfInfoMarkerUnset) [list source [file join $dir ctfInfo.wish]]
44-set auto_index(::CTF::ctfInfoPredictedThonRing) [list source [file join $dir ctfInfo.wish]]
45-set auto_index(::CTF::ctfInfoPredictedMarkerOnCanvas) [list source [file join $dir ctfInfo.wish]]
46-set auto_index(::CTF::ctfInfoPredictedMarkerSet) [list source [file join $dir ctfInfo.wish]]
47-set auto_index(::CTF::ctfInfoPredictedMarkerUnset) [list source [file join $dir ctfInfo.wish]]
48-set auto_index(::CTF::ctfInfoMarkerReset) [list source [file join $dir ctfInfo.wish]]
49-set auto_index(::CTF::ctfInfoGraphUpdate) [list source [file join $dir ctfInfo.wish]]
50-set auto_index(::CTF::ctfInfoScatteringLineCreate) [list source [file join $dir ctfInfo.wish]]
51-set auto_index(::CTF::ctfInfoCTFLineCreate) [list source [file join $dir ctfInfo.wish]]
52-set auto_index(::CTF::ctfInfoGraphConfiguration) [list source [file join $dir ctfInfo.wish]]
53-set auto_index(::CTF::ctfInfoGraphPenCreate) [list source [file join $dir ctfInfo.wish]]
54-set auto_index(::CTF::ctfInfoCTFInfomationSet) [list source [file join $dir ctfInfo.wish]]
55-set auto_index(::CTF::ctfInfoCTFCalculation) [list source [file join $dir ctfInfo.wish]]
56-set auto_index(::CTF::ctfInfoScatteringCalc) [list source [file join $dir ctfInfo.wish]]
57-set auto_index(::CTF::ctfInfoListGet) [list source [file join $dir ctfInfo.wish]]
58-set auto_index(::CTF::ctfInfoAppend) [list source [file join $dir ctfInfo.wish]]
59-set auto_index(seqFileTemplateChange) [list source [file join $dir seqFileSelect.wish]]
60-set auto_index(seqFileSelect) [list source [file join $dir seqFileSelect.wish]]
61-set auto_index(seqFileSelectBindings) [list source [file join $dir seqFileSelect.wish]]
62-set auto_index(seqFileSelectList) [list source [file join $dir seqFileSelect.wish]]
63-set auto_index(seqFileTemplateSelectOK) [list source [file join $dir seqFileSelect.wish]]
64-set auto_index(seqFileTemplateSelectComplete) [list source [file join $dir seqFileSelect.wish]]
65-set auto_index(seqFileSelectOK) [list source [file join $dir seqFileSelect.wish]]
66-set auto_index(seqFileSelectComplete) [list source [file join $dir seqFileSelect.wish]]
67-set auto_index(seqFileSelectPrev) [list source [file join $dir seqFileSelect.wish]]
68-set auto_index(seqFileSelectNext) [list source [file join $dir seqFileSelect.wish]]
69-set auto_index(seqFileSelectCancel) [list source [file join $dir seqFileSelect.wish]]
70-set auto_index(seqFileSelectClick) [list source [file join $dir seqFileSelect.wish]]
71-set auto_index(seqFileSelectTake) [list source [file join $dir seqFileSelect.wish]]
72-set auto_index(bltResetBindings) [list source [file join $dir graphFeature.wish]]
73-set auto_index(bltActivateLegend) [list source [file join $dir graphFeature.wish]]
74-set auto_index(SetActiveLegend) [list source [file join $dir graphFeature.wish]]
75-set auto_index(SetCrosshairs) [list source [file join $dir graphFeature.wish]]
76-set auto_index(bltFindElement) [list source [file join $dir graphFeature.wish]]
77-set auto_index(bltFlashPoint) [list source [file join $dir graphFeature.wish]]
78-set auto_index(SetClosestPoint) [list source [file join $dir graphFeature.wish]]
79-set auto_index(bltGetCoords) [list source [file join $dir graphFeature.wish]]
80-set auto_index(bltGetAnchor) [list source [file join $dir graphFeature.wish]]
81-set auto_index(bltGetAnchorX) [list source [file join $dir graphFeature.wish]]
82-set auto_index(bltBox) [list source [file join $dir graphFeature.wish]]
83-set auto_index(bltBoxX) [list source [file join $dir graphFeature.wish]]
84-set auto_index(bltScan) [list source [file join $dir graphFeature.wish]]
85-set auto_index(bltScanX) [list source [file join $dir graphFeature.wish]]
86-set auto_index(bltZoom) [list source [file join $dir graphFeature.wish]]
87-set auto_index(bltZoomX) [list source [file join $dir graphFeature.wish]]
88-set auto_index(SetZoom) [list source [file join $dir graphFeature.wish]]
89-set auto_index(SetZoomX) [list source [file join $dir graphFeature.wish]]
90-set auto_index(SetPrint) [list source [file join $dir graphFeature.wish]]
91-set auto_index(CheckButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
92-set auto_index(RadioButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
93-set auto_index(RadioButtonsCreateWithPackWithCommand) [list source [file join $dir VariousButton.wish]]
94-set auto_index(RadioButtonsCreate) [list source [file join $dir VariousButton.wish]]
95-set auto_index(CheckButtonsCreate) [list source [file join $dir VariousButton.wish]]
96-set auto_index(eosCommandExecute) [list source [file join $dir commandUtil.wish]]
97-set auto_index(defaultLoad) [list source [file join $dir defaultLoad.wish]]
98-set auto_index(defaultLoadProcTemplate) [list source [file join $dir defaultLoad.wish]]
99-set auto_index(Canvas) [list source [file join $dir Canvas.wish]]
100-set auto_index(scrolledCanvas) [list source [file join $dir Canvas.wish]]
101-set auto_index(colormapSet) [list source [file join $dir Colormap.wish]]
102-set auto_index(Blt_ActiveLegend) [list source [file join $dir bltGraph.wish]]
103-set auto_index(Blt_Crosshairs) [list source [file join $dir bltGraph.wish]]
104-set auto_index(Blt_ZoomStack) [list source [file join $dir bltGraph.wish]]
105-set auto_index(Blt_PrintKey) [list source [file join $dir bltGraph.wish]]
106-set auto_index(Blt_ClosestPoint) [list source [file join $dir bltGraph.wish]]
107-set auto_index(::blt::ActivateLegend) [list source [file join $dir bltGraph.wish]]
108-set auto_index(::blt::DeactivateLegend) [list source [file join $dir bltGraph.wish]]
109-set auto_index(::blt::HighlightLegend) [list source [file join $dir bltGraph.wish]]
110-set auto_index(::blt::Crosshairs) [list source [file join $dir bltGraph.wish]]
111-set auto_index(::blt::ZoomStack) [list source [file join $dir bltGraph.wish]]
112-set auto_index(::blt::PrintKey) [list source [file join $dir bltGraph.wish]]
113-set auto_index(::blt::ClosestPoint) [list source [file join $dir bltGraph.wish]]
114-set auto_index(::blt::AddBindTag) [list source [file join $dir bltGraph.wish]]
115-set auto_index(::blt::FindElement) [list source [file join $dir bltGraph.wish]]
116-set auto_index(::blt::FlashPoint) [list source [file join $dir bltGraph.wish]]
117-set auto_index(::blt::GetCoords) [list source [file join $dir bltGraph.wish]]
118-set auto_index(::blt::MarkPoint) [list source [file join $dir bltGraph.wish]]
119-set auto_index(::blt::DestroyZoomTitle) [list source [file join $dir bltGraph.wish]]
120-set auto_index(::blt::PopZoom) [list source [file join $dir bltGraph.wish]]
121-set auto_index(::blt::PushZoom) [list source [file join $dir bltGraph.wish]]
122-set auto_index(::blt::ResetZoom) [list source [file join $dir bltGraph.wish]]
123-set auto_index(::blt::ZoomTitleNext) [list source [file join $dir bltGraph.wish]]
124-set auto_index(::blt::ZoomTitleLast) [list source [file join $dir bltGraph.wish]]
125-set auto_index(::blt::SetZoomPoint) [list source [file join $dir bltGraph.wish]]
126-set auto_index(::blt::Box) [list source [file join $dir bltGraph.wish]]
127-set auto_index(Blt_PostScriptDialog) [list source [file join $dir bltGraph.wish]]
128-set auto_index(::blt::ResetPostScript) [list source [file join $dir bltGraph.wish]]
129-set auto_index(fileSaveSureWin) [list source [file join $dir fileSave.wish]]
130-set auto_index(fileSaveSureOK) [list source [file join $dir fileSave.wish]]
131-set auto_index(fileSaveSureCancel) [list source [file join $dir fileSave.wish]]
132-set auto_index(fileSaveSureWinResources) [list source [file join $dir fileSave.wish]]
133-set auto_index(fileSave) [list source [file join $dir fileSave.wish]]
134-set auto_index(fileSaveResources) [list source [file join $dir fileSave.wish]]
135-set auto_index(fileSaveBindings) [list source [file join $dir fileSave.wish]]
136-set auto_index(fileSaveList) [list source [file join $dir fileSave.wish]]
137-set auto_index(fileSaveOK) [list source [file join $dir fileSave.wish]]
138-set auto_index(fileSaveCancel) [list source [file join $dir fileSave.wish]]
139-set auto_index(fileSaveClick) [list source [file join $dir fileSave.wish]]
140-set auto_index(fileSaveTake) [list source [file join $dir fileSave.wish]]
141-set auto_index(fileSaveComplete) [list source [file join $dir fileSave.wish]]
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageMasking.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageMasking.c
@@ -213,7 +213,11 @@ lmrcImageMasking(mrcImage* out, mrcImage* in, lmrcImageMaskingInfo* linfo, int m
213213 + SQR((y - linfo->c.y )/(linfo->n.y/2.0))
214214 + SQR((z - linfo->c.z )/(linfo->n.z/2.0)) <= 1) {
215215 mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
216- data -= avg;
216+ if(linfo->mode==0) {
217+ data -= avg;
218+ } else {
219+ data = 0;
220+ }
217221 DEBUGPRINT3("(%d, %d, %d) inside circle\n", x, y, z);
218222 }
219223 } else {
@@ -225,6 +229,8 @@ lmrcImageMasking(mrcImage* out, mrcImage* in, lmrcImageMaskingInfo* linfo, int m
225229 + SQR((tmp.data[1])/(linfo->n.y/2.0))
226230 + SQR((tmp.data[2])/(linfo->n.z/2.0)) <= 1) {
227231 mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
232+ } else {
233+ data = 0;
228234 }
229235 }
230236 mrcPixelDataSet(out, x, y, z, data, mrcPixelRePart);
@@ -281,6 +287,82 @@ lmrcImageMasking(mrcImage* out, mrcImage* in, lmrcImageMaskingInfo* linfo, int m
281287 && fabs(y - linfo->c.y ) <= (linfo->n.y/2.0)
282288 && fabs(z - linfo->c.z ) <= (linfo->n.z/2.0) ) {
283289 mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
290+ if(linfo->mode==0) {
291+ data -= avg;
292+ } else {
293+ data = 0.0;
294+ }
295+ DEBUGPRINT3("(%d, %d, %d) inside square\n", x, y, z);
296+ }
297+ } else {
298+ x0 = (nx.data[0]*(x-cx0.data[0])+nx.data[1]*(y-cx0.data[1])+nx.data[2]*(z-cx0.data[2]));
299+ x1 = (nx.data[0]*(x-cx1.data[0])+nx.data[1]*(y-cx1.data[1])+nx.data[2]*(z-cx1.data[2]));
300+ y0 = (ny.data[0]*(x-cy0.data[0])+ny.data[1]*(y-cy0.data[1])+ny.data[2]*(z-cy0.data[2]));
301+ y1 = (ny.data[0]*(x-cy1.data[0])+ny.data[1]*(y-cy1.data[1])+ny.data[2]*(z-cy1.data[2]));
302+ z0 = (nz.data[0]*(x-cz0.data[0])+nz.data[1]*(y-cz0.data[1])+nz.data[2]*(z-cz0.data[2]));
303+ z1 = (nz.data[0]*(x-cz1.data[0])+nz.data[1]*(y-cz1.data[1])+nz.data[2]*(z-cz1.data[2]));
304+ if(x0*x1 < 0 && y0*y1 < 0 && z0*z1<0) {
305+ mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
306+ data -= avg;
307+ //DEBUGPRINT3("(%d, %d, %d) inside square\n", x, y, z);
308+ } else {
309+ data = 0;
310+ }
311+ }
312+ mrcPixelDataSet(out, x, y, z, data, mrcPixelRePart);
313+ }
314+ }
315+ }
316+ break;
317+ case lmrcImageMaskingInfoCylinder:
318+ sum = 0.0;
319+ count = 0;
320+ avg = 0;
321+ if (linfo->mode==0){
322+ for(z=0; z<out->HeaderN.z; z++) {
323+ for(y=0; y<out->HeaderN.y; y++) {
324+ for(x=0; x<out->HeaderN.x; x++) {
325+ if(!linfo->flagRotation) {
326+ if( fabs(x - linfo->c.x ) > (linfo->n.x/2.0)
327+ || fabs(y - linfo->c.y ) > (linfo->n.y/2.0)
328+ || fabs(z - linfo->c.z ) > (linfo->n.z/2.0) ) {
329+ mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
330+ sum += data;
331+ count++;
332+ }
333+ } else {
334+ x0 = (nx.data[0]*(x-cx0.data[0])+nx.data[1]*(y-cx0.data[1])+nx.data[2]*(z-cx0.data[2]));
335+ x1 = (nx.data[0]*(x-cx1.data[0])+nx.data[1]*(y-cx1.data[1])+nx.data[2]*(z-cx1.data[2]));
336+ y0 = (ny.data[0]*(x-cy0.data[0])+ny.data[1]*(y-cy0.data[1])+ny.data[2]*(z-cy0.data[2]));
337+ y1 = (ny.data[0]*(x-cy1.data[0])+ny.data[1]*(y-cy1.data[1])+ny.data[2]*(z-cy1.data[2]));
338+ z0 = (nz.data[0]*(x-cz0.data[0])+nz.data[1]*(y-cz0.data[1])+nz.data[2]*(z-cz0.data[2]));
339+ z1 = (nz.data[0]*(x-cz1.data[0])+nz.data[1]*(y-cz1.data[1])+nz.data[2]*(z-cz1.data[2]));
340+ if(x0*x1 < 0 && y0*y1 < 0 && z0*z1<0) {
341+ //DEBUGPRINT6("x0-z1: %f %f %f %f %f %f\n", x0, x1, y0, y1, z0, z1);
342+ mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
343+ sum += data;
344+ count++;
345+ }
346+ }
347+ }
348+ }
349+ }
350+ if(0<count) {
351+ avg = sum/count;
352+ }
353+ }
354+ DEBUGPRINT2("average %f %d\n", avg, count);
355+
356+ for(z=0; z<out->HeaderN.z; z++) {
357+ for(y=0; y<out->HeaderN.y; y++) {
358+ for(x=0; x<out->HeaderN.x; x++) {
359+ data = 0;
360+ if(!linfo->flagRotation) {
361+ //DEBUGPRINT("Not Rotated\n")
362+ if( fabs(x - linfo->c.x ) <= (linfo->n.x/2.0)
363+ && fabs(y - linfo->c.y ) <= (linfo->n.y/2.0)
364+ && fabs(z - linfo->c.z ) <= (linfo->n.z/2.0) ) {
365+ mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
284366 data -= avg;
285367 DEBUGPRINT3("(%d, %d, %d) inside square\n", x, y, z);
286368 }
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageMasking.h
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageMasking.h
@@ -20,7 +20,8 @@
2020 /* struct begin */
2121 typedef enum lmrcImageMaskingInfoShape {
2222 lmrcImageMaskingInfoShapeCircle=0,
23- lmrcImageMaskingInfoSquare=1
23+ lmrcImageMaskingInfoSquare=1,
24+ lmrcImageMaskingInfoCylinder=2
2425 } lmrcImageMaskingInfoShape;
2526
2627 typedef struct lmrcImageMaskingInfo {
--- a/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcMultiFFTCentralSectionsCompare/src/test/Makefile
@@ -14,10 +14,16 @@ help:
1414
1515 exec:
1616 @echo "----- Execution Check -----"
17+<<<<<<< HEAD
18+ ../$(OSTYPE)/$(OBJECTNAME) -i TEST.fft2d -i3d REF.txt -Prior PRIOR.txt -EulerMode YOYS -InterpMode 1 -o OUT.txt -Lmode 0 0.0 0.90
19+ ../$(OSTYPE)/$(OBJECTNAME) -i data/datashellshell/121p.0.0.0.fft2d -i3d /Users/nakanosaki/Eos/src/Tools/rec3d/mrc3Dto2DFFT/src/test/data/Postshell-nor/Postshell-20.txt /Users/nakanosaki/Eos/src/Tools/rec3d/mrc3Dto2DFFT/src/test/ -EulerMode YOYS -InterpMode 1 -o data/TESTPostshell/Test-0-0-0.txt -Lmode 0 0.0 0.90
20+
21+=======
1722 ../$(OSTYPE)/$(OBJECTNAME) -i $(DATA).fft2d ./ -i3d data/$(DATABASE).roilst data/refData/ -EulerMode YOYS -InterpMode 1 -o $(DATA).out0 -oL $(DATA).outProb0 -Lmode 0 0.0 0.90 -EulerMode YOYS -Rot1 0 359 30 -Rot2 0 359 30 -Rot3 0 359 30
1823 ../$(OSTYPE)/$(OBJECTNAME) -i $(DATA).fft2d ./ -i3d data/$(DATABASE).roilst data/refData/ -EulerMode YOYS -InterpMode 1 -o $(DATA).out1 -oL $(DATA).outProb1 -Lmode 1 0.0 0.90
1924
2025 NUM=00171
26+>>>>>>> dca254b48207ce4fe547f3ad98197ffcf409cf50
2127 exec2:
2228 @echo "----- Execution Check -----"
2329 ../$(OSTYPE)/$(OBJECTNAME) -i $(DATA)-$(NUM).fft2d ./ -i3d data/$(DATABASE).roilst data/refData/ -EulerMode YOYS -InterpMode 1 -o $(DATA)-$(NUM).out0 -oL $(DATA)-$(NUM).outProb0 -Lmode 0 0.0 0.90 -EulerMode YOYS -Rot1 0 359 30 -Rot2 0 359 30 -Rot3 0 359 30
Show on old repository browser