• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#windowsobjective-ccocoaqt誰得pythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revisión9a9c49fc45e870bb09dec66791f51719a634804e (tree)
Tiempo2015-04-02 05:08:25
AutorTakuo Yasunaga <yasunaga@bio....>
CommiterTakuo Yasunaga

Log Message

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

Conflicts:
bin/wish/Display2/tclIndex

Cambiar Resumen

Diferencia incremental

--- a/bin/wish/Display2/tclIndex
+++ b/bin/wish/Display2/tclIndex
@@ -46,6 +46,7 @@ set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuR
4646 set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
4747 set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
4848 set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
49+<<<<<<< HEAD
4950 set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
5051 set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
5152 set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
@@ -60,6 +61,9 @@ set auto_index(rectangleResize) [list source [file join $dir RoiAreaResize.wish]
6061 set auto_index(rectangleResizeCalc) [list source [file join $dir RoiAreaResize.wish]]
6162 set auto_index(lineResize) [list source [file join $dir RoiAreaResize.wish]]
6263 set auto_index(splineResize) [list source [file join $dir RoiAreaResize.wish]]
64+=======
65+set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
66+>>>>>>> FETCH_HEAD
6367 set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
6468 set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
6569 set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
@@ -132,3 +136,4 @@ set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.w
132136 set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
133137 set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
134138 set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
139+set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
--- a/lib/tclIndex
+++ b/lib/tclIndex
@@ -6,75 +6,6 @@
66 # element name is the name of a command and the value is
77 # a script that loads the command.
88
9-set auto_index(fileSaveSureWin) [list source [file join $dir fileSave.wish]]
10-set auto_index(fileSaveSureOK) [list source [file join $dir fileSave.wish]]
11-set auto_index(fileSaveSureCancel) [list source [file join $dir fileSave.wish]]
12-set auto_index(fileSaveSureWinResources) [list source [file join $dir fileSave.wish]]
13-set auto_index(fileSave) [list source [file join $dir fileSave.wish]]
14-set auto_index(fileSaveResources) [list source [file join $dir fileSave.wish]]
15-set auto_index(fileSaveBindings) [list source [file join $dir fileSave.wish]]
16-set auto_index(fileSaveList) [list source [file join $dir fileSave.wish]]
17-set auto_index(fileSaveOK) [list source [file join $dir fileSave.wish]]
18-set auto_index(fileSaveCancel) [list source [file join $dir fileSave.wish]]
19-set auto_index(fileSaveClick) [list source [file join $dir fileSave.wish]]
20-set auto_index(fileSaveTake) [list source [file join $dir fileSave.wish]]
21-set auto_index(fileSaveComplete) [list source [file join $dir fileSave.wish]]
22-set auto_index(fileSelect) [list source [file join $dir fileSelect.wish]]
23-set auto_index(fileSelectResources) [list source [file join $dir fileSelect.wish]]
24-set auto_index(fileSelectBindings) [list source [file join $dir fileSelect.wish]]
25-set auto_index(fileSelectList) [list source [file join $dir fileSelect.wish]]
26-set auto_index(fileSelectOK) [list source [file join $dir fileSelect.wish]]
27-set auto_index(fileSelectCancel) [list source [file join $dir fileSelect.wish]]
28-set auto_index(fileSelectClick) [list source [file join $dir fileSelect.wish]]
29-set auto_index(fileSelectTake) [list source [file join $dir fileSelect.wish]]
30-set auto_index(fileSelectComplete) [list source [file join $dir fileSelect.wish]]
31-set auto_index(colormapSet) [list source [file join $dir Colormap.wish]]
32-set auto_index(seqFileTemplateChange) [list source [file join $dir seqFileSelect.wish]]
33-set auto_index(seqFileSelect) [list source [file join $dir seqFileSelect.wish]]
34-set auto_index(seqFileSelectBindings) [list source [file join $dir seqFileSelect.wish]]
35-set auto_index(seqFileSelectList) [list source [file join $dir seqFileSelect.wish]]
36-set auto_index(seqFileTemplateSelectOK) [list source [file join $dir seqFileSelect.wish]]
37-set auto_index(seqFileTemplateSelectComplete) [list source [file join $dir seqFileSelect.wish]]
38-set auto_index(seqFileSelectOK) [list source [file join $dir seqFileSelect.wish]]
39-set auto_index(seqFileSelectComplete) [list source [file join $dir seqFileSelect.wish]]
40-set auto_index(seqFileSelectPrev) [list source [file join $dir seqFileSelect.wish]]
41-set auto_index(seqFileSelectNext) [list source [file join $dir seqFileSelect.wish]]
42-set auto_index(seqFileSelectCancel) [list source [file join $dir seqFileSelect.wish]]
43-set auto_index(seqFileSelectClick) [list source [file join $dir seqFileSelect.wish]]
44-set auto_index(seqFileSelectTake) [list source [file join $dir seqFileSelect.wish]]
45-set auto_index(CheckButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
46-set auto_index(RadioButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
47-set auto_index(RadioButtonsCreateWithPackWithCommand) [list source [file join $dir VariousButton.wish]]
48-set auto_index(RadioButtonsCreate) [list source [file join $dir VariousButton.wish]]
49-set auto_index(CheckButtonsCreate) [list source [file join $dir VariousButton.wish]]
50-set auto_index(CommandEntry) [list source [file join $dir CommandEntry.wish]]
51-set auto_index(CommandEntryWithSelection) [list source [file join $dir CommandEntry.wish]]
52-set auto_index(CommandEntryWithSelectionEntrySet) [list source [file join $dir CommandEntry.wish]]
53-set auto_index(CommandEntryWithUpDown) [list source [file join $dir CommandEntry.wish]]
54-set auto_index(CommandEntryWithUpDownUp) [list source [file join $dir CommandEntry.wish]]
55-set auto_index(CommandEntryWithUpDownDown) [list source [file join $dir CommandEntry.wish]]
56-set auto_index(bltResetBindings) [list source [file join $dir graphFeature.wish]]
57-set auto_index(bltActivateLegend) [list source [file join $dir graphFeature.wish]]
58-set auto_index(SetActiveLegend) [list source [file join $dir graphFeature.wish]]
59-set auto_index(SetCrosshairs) [list source [file join $dir graphFeature.wish]]
60-set auto_index(bltFindElement) [list source [file join $dir graphFeature.wish]]
61-set auto_index(bltFlashPoint) [list source [file join $dir graphFeature.wish]]
62-set auto_index(SetClosestPoint) [list source [file join $dir graphFeature.wish]]
63-set auto_index(bltGetCoords) [list source [file join $dir graphFeature.wish]]
64-set auto_index(bltGetAnchor) [list source [file join $dir graphFeature.wish]]
65-set auto_index(bltGetAnchorX) [list source [file join $dir graphFeature.wish]]
66-set auto_index(bltBox) [list source [file join $dir graphFeature.wish]]
67-set auto_index(bltBoxX) [list source [file join $dir graphFeature.wish]]
68-set auto_index(bltScan) [list source [file join $dir graphFeature.wish]]
69-set auto_index(bltScanX) [list source [file join $dir graphFeature.wish]]
70-set auto_index(bltZoom) [list source [file join $dir graphFeature.wish]]
71-set auto_index(bltZoomX) [list source [file join $dir graphFeature.wish]]
72-set auto_index(SetZoom) [list source [file join $dir graphFeature.wish]]
73-set auto_index(SetZoomX) [list source [file join $dir graphFeature.wish]]
74-set auto_index(SetPrint) [list source [file join $dir graphFeature.wish]]
75-set auto_index(NotSupportedCommand) [list source [file join $dir tclUtil.wish]]
76-set auto_index(Canvas) [list source [file join $dir Canvas.wish]]
77-set auto_index(scrolledCanvas) [list source [file join $dir Canvas.wish]]
789 set auto_index(Blt_ActiveLegend) [list source [file join $dir bltGraph.wish]]
7910 set auto_index(Blt_Crosshairs) [list source [file join $dir bltGraph.wish]]
8011 set auto_index(Blt_ZoomStack) [list source [file join $dir bltGraph.wish]]
@@ -102,8 +33,16 @@ set auto_index(::blt::SetZoomPoint) [list source [file join $dir bltGraph.wish]]
10233 set auto_index(::blt::Box) [list source [file join $dir bltGraph.wish]]
10334 set auto_index(Blt_PostScriptDialog) [list source [file join $dir bltGraph.wish]]
10435 set auto_index(::blt::ResetPostScript) [list source [file join $dir bltGraph.wish]]
105-set auto_index(fileCanBeOverwritten) [list source [file join $dir fileUtil.wish]]
106-set auto_index(relativePathGet) [list source [file join $dir fileUtil.wish]]
36+set auto_index(Canvas) [list source [file join $dir Canvas.wish]]
37+set auto_index(scrolledCanvas) [list source [file join $dir Canvas.wish]]
38+set auto_index(colormapSet) [list source [file join $dir Colormap.wish]]
39+set auto_index(CommandEntry) [list source [file join $dir CommandEntry.wish]]
40+set auto_index(CommandEntryWithSelection) [list source [file join $dir CommandEntry.wish]]
41+set auto_index(CommandEntryWithSelectionEntrySet) [list source [file join $dir CommandEntry.wish]]
42+set auto_index(CommandEntryWithUpDown) [list source [file join $dir CommandEntry.wish]]
43+set auto_index(CommandEntryWithUpDownUp) [list source [file join $dir CommandEntry.wish]]
44+set auto_index(CommandEntryWithUpDownDown) [list source [file join $dir CommandEntry.wish]]
45+set auto_index(eosCommandExecute) [list source [file join $dir commandUtil.wish]]
10746 set auto_index(::CTF::Init) [list source [file join $dir ctfInfo.wish]]
10847 set auto_index(::CTF::Win) [list source [file join $dir ctfInfo.wish]]
10948 set auto_index(::CTF::ctfInfoGraphInfoFrameCreate) [list source [file join $dir ctfInfo.wish]]
@@ -135,4 +74,65 @@ set auto_index(::CTF::ctfInfoCTFCalculation) [list source [file join $dir ctfInf
13574 set auto_index(::CTF::ctfInfoScatteringCalc) [list source [file join $dir ctfInfo.wish]]
13675 set auto_index(::CTF::ctfInfoListGet) [list source [file join $dir ctfInfo.wish]]
13776 set auto_index(::CTF::ctfInfoAppend) [list source [file join $dir ctfInfo.wish]]
138-set auto_index(eosCommandExecute) [list source [file join $dir commandUtil.wish]]
77+set auto_index(fileSaveSureWin) [list source [file join $dir fileSave.wish]]
78+set auto_index(fileSaveSureOK) [list source [file join $dir fileSave.wish]]
79+set auto_index(fileSaveSureCancel) [list source [file join $dir fileSave.wish]]
80+set auto_index(fileSaveSureWinResources) [list source [file join $dir fileSave.wish]]
81+set auto_index(fileSave) [list source [file join $dir fileSave.wish]]
82+set auto_index(fileSaveResources) [list source [file join $dir fileSave.wish]]
83+set auto_index(fileSaveBindings) [list source [file join $dir fileSave.wish]]
84+set auto_index(fileSaveList) [list source [file join $dir fileSave.wish]]
85+set auto_index(fileSaveOK) [list source [file join $dir fileSave.wish]]
86+set auto_index(fileSaveCancel) [list source [file join $dir fileSave.wish]]
87+set auto_index(fileSaveClick) [list source [file join $dir fileSave.wish]]
88+set auto_index(fileSaveTake) [list source [file join $dir fileSave.wish]]
89+set auto_index(fileSaveComplete) [list source [file join $dir fileSave.wish]]
90+set auto_index(fileSelect) [list source [file join $dir fileSelect.wish]]
91+set auto_index(fileSelectResources) [list source [file join $dir fileSelect.wish]]
92+set auto_index(fileSelectBindings) [list source [file join $dir fileSelect.wish]]
93+set auto_index(fileSelectList) [list source [file join $dir fileSelect.wish]]
94+set auto_index(fileSelectOK) [list source [file join $dir fileSelect.wish]]
95+set auto_index(fileSelectCancel) [list source [file join $dir fileSelect.wish]]
96+set auto_index(fileSelectClick) [list source [file join $dir fileSelect.wish]]
97+set auto_index(fileSelectTake) [list source [file join $dir fileSelect.wish]]
98+set auto_index(fileSelectComplete) [list source [file join $dir fileSelect.wish]]
99+set auto_index(fileCanBeOverwritten) [list source [file join $dir fileUtil.wish]]
100+set auto_index(relativePathGet) [list source [file join $dir fileUtil.wish]]
101+set auto_index(bltResetBindings) [list source [file join $dir graphFeature.wish]]
102+set auto_index(bltActivateLegend) [list source [file join $dir graphFeature.wish]]
103+set auto_index(SetActiveLegend) [list source [file join $dir graphFeature.wish]]
104+set auto_index(SetCrosshairs) [list source [file join $dir graphFeature.wish]]
105+set auto_index(bltFindElement) [list source [file join $dir graphFeature.wish]]
106+set auto_index(bltFlashPoint) [list source [file join $dir graphFeature.wish]]
107+set auto_index(SetClosestPoint) [list source [file join $dir graphFeature.wish]]
108+set auto_index(bltGetCoords) [list source [file join $dir graphFeature.wish]]
109+set auto_index(bltGetAnchor) [list source [file join $dir graphFeature.wish]]
110+set auto_index(bltGetAnchorX) [list source [file join $dir graphFeature.wish]]
111+set auto_index(bltBox) [list source [file join $dir graphFeature.wish]]
112+set auto_index(bltBoxX) [list source [file join $dir graphFeature.wish]]
113+set auto_index(bltScan) [list source [file join $dir graphFeature.wish]]
114+set auto_index(bltScanX) [list source [file join $dir graphFeature.wish]]
115+set auto_index(bltZoom) [list source [file join $dir graphFeature.wish]]
116+set auto_index(bltZoomX) [list source [file join $dir graphFeature.wish]]
117+set auto_index(SetZoom) [list source [file join $dir graphFeature.wish]]
118+set auto_index(SetZoomX) [list source [file join $dir graphFeature.wish]]
119+set auto_index(SetPrint) [list source [file join $dir graphFeature.wish]]
120+set auto_index(seqFileTemplateChange) [list source [file join $dir seqFileSelect.wish]]
121+set auto_index(seqFileSelect) [list source [file join $dir seqFileSelect.wish]]
122+set auto_index(seqFileSelectBindings) [list source [file join $dir seqFileSelect.wish]]
123+set auto_index(seqFileSelectList) [list source [file join $dir seqFileSelect.wish]]
124+set auto_index(seqFileTemplateSelectOK) [list source [file join $dir seqFileSelect.wish]]
125+set auto_index(seqFileTemplateSelectComplete) [list source [file join $dir seqFileSelect.wish]]
126+set auto_index(seqFileSelectOK) [list source [file join $dir seqFileSelect.wish]]
127+set auto_index(seqFileSelectComplete) [list source [file join $dir seqFileSelect.wish]]
128+set auto_index(seqFileSelectPrev) [list source [file join $dir seqFileSelect.wish]]
129+set auto_index(seqFileSelectNext) [list source [file join $dir seqFileSelect.wish]]
130+set auto_index(seqFileSelectCancel) [list source [file join $dir seqFileSelect.wish]]
131+set auto_index(seqFileSelectClick) [list source [file join $dir seqFileSelect.wish]]
132+set auto_index(seqFileSelectTake) [list source [file join $dir seqFileSelect.wish]]
133+set auto_index(NotSupportedCommand) [list source [file join $dir tclUtil.wish]]
134+set auto_index(CheckButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
135+set auto_index(RadioButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
136+set auto_index(RadioButtonsCreateWithPackWithCommand) [list source [file join $dir VariousButton.wish]]
137+set auto_index(RadioButtonsCreate) [list source [file join $dir VariousButton.wish]]
138+set auto_index(CheckButtonsCreate) [list source [file join $dir VariousButton.wish]]
--- a/src/Objects/DataManip/dmFile/inc/dmFile.h
+++ b/src/Objects/DataManip/dmFile/inc/dmFile.h
@@ -27,62 +27,98 @@ typedef __int16_t dmFileInteger2;
2727 typedef __int8_t dmFileInteger1;
2828
2929 typedef enum dmFileTagDataType {
30- dmFileTagDataTypeShort=2,
31- dmFileTagDataTypeLong =3,
32- dmFileTagDataTypeUShort =4,
30+ dmFileTagDataTypeInt2 =2,
31+ dmFileTagDataTypeInt4 =3,
32+ dmFileTagDataTypeUInt2 =4,
33+ dmFileTagDataTypeUInt4 =5,
34+ dmFileTagDataTypeReal4 =6,
35+ dmFileTagDataTypeReal8 =7,
36+ dmFileTagDataTypeBool1 =8,
37+ dmFileTagDataTypeChar1 =9,
38+ dmFileTagDataTypeInt1 =0xa,
39+ dmFileTagDataTypeInt8 =0xb,
40+ dmFileTagDataTypeStruct =0xf,
41+ dmFileTagDataTypeString =0x12,
42+ dmFileTagDataTypeArray =0x14,
3343 } dmFileTagDataType;
3444
45+static size_t __dmFileTagDataTypeSize[24] = {
46+ 0, 0, 2, 4, 2, 4, 4, 8, 1, 1,
47+ 1, 8, 0, 0, 0, 0, 0, 0, 0, 0,
48+ 0, 0, 0, 0
49+};
50+
51+static char* __dmFileTagDataTypeFormat[24] = {
52+ 0, 0, "%d", "%d", "%u", "%u", "%f", "%f", "%d", "%c",
53+ "%d", "%d", 0, 0, 0, 0, 0, 0, 0, 0,
54+ 0, 0, 0, 0
55+};
56+
3557 // Header
36-typedef struct dm3FileHeader {
58+typedef struct dmFile3Header {
3759 dmFileInteger4 version;
3860 dmFileInteger4 rootLength;
3961 dmFileInteger4 byteOrder;
40-} dm3FileHeader;
62+} dmFile3Header;
4163
42-typedef struct dm4FileHeader {
64+typedef struct dmFile4Header {
4365 dmFileInteger4 version;
4466 dmFileInteger8 rootLength;
4567 dmFileInteger4 byteOrder;
46-} dm4FileHeader;
47-
48-// Root Tag Directory
49-typedef struct dm3FileRootTagDirectory {
50- dmFileInteger1 sortf;
51- dmFileInteger1 closef;
52- dmFileInteger4 numberOfTags;
53-} dm3FileRootTagDirectory;
68+} dmFile4Header;
5469
55-typedef struct dm4FileRootTagDirectory {
56- dmFileInteger1 sortf;
57- dmFileInteger1 closef;
58- dmFileInteger8 numberOfTags;
59-} dm4FileRootTagDirectory;
70+typedef struct dmFile3TagDirectory dmFile3TagDirectory;
71+typedef struct dmFile4TagDirectory dmFile4TagDirectory;
6072
61-// Tag Directory
62-typedef struct dm3FileTagDirectrory {
73+// Tag
74+typedef struct dmFile3Tag {
6375 dmFileInteger1 tagID;
6476 dmFileInteger2 tagNameLength; // Bytes
6577 char* tagName;
78+ // Tag
6679 dmFileInteger1 seperator[4];
67- dmFileInteger4 sizeDim;
68- dmFileInteger4* dim;
69-} dm3FileTagDirectrory;
70-
71-typedef struct dm4FileTagDirectrory {
80+ dmFileInteger4 ninfo;
81+ dmFileInteger4* info;
82+ void* value;
83+ void** value2;
84+ // TagDirectory
85+ dmFile3TagDirectory* tagDir;
86+} dmFile3Tag;
87+
88+typedef struct dmFile4Tag {
7289 dmFileInteger1 tagID;
7390 dmFileInteger2 tagNameLength; // Bytes
7491 char* tagName;
75-} dm4FileTagDirectrory;
92+ // Tag
93+ dmFileInteger1 seperator[4];
94+ // TagDirectory
95+ dmFile4TagDirectory* tagDir;
96+} dmFile4Tag;
97+
98+// Root Tag Directory
99+struct dmFile3TagDirectory {
100+ dmFileInteger1 sortf;
101+ dmFileInteger1 closef;
102+ dmFileInteger4 numberOfTags;
103+ dmFile3Tag* Tags;
104+} ;
105+
106+struct dmFile4TagDirectory {
107+ dmFileInteger1 sortf;
108+ dmFileInteger1 closef;
109+ dmFileInteger8 numberOfTags;
110+ dmFile4Tag* Tags;
111+} ;
76112
77113 typedef struct dmFile {
78114 // Header
79115 dmFileInteger4 version;
80- dm3FileHeader Header3;
81- dm4FileHeader Header4;
116+ dmFile3Header Header3;
117+ dmFile4Header Header4;
82118 // Root Tag
83- dm3FileRootTagDirectory RootTag3;
84- dm4FileRootTagDirectory RootTag4;
85-
119+ dmFile3TagDirectory RootTag3;
120+ dmFile4TagDirectory RootTag4;
121+ // Tail
86122 dmFileInteger8 Tail;
87123 } dmFile;
88124
@@ -99,7 +135,26 @@ extern void dmFileInfo(FILE* fpt, dmFile dm, int mode);
99135
100136 // in dmFileRead.c
101137 extern void dmFileRead(FILE* fpt, dmFile* dm, char* message, int mode);
102-
138+// DM Header and End Read: check file format
139+extern void dmFileHeaderTailRead(FILE* fpt, dmFile* dm, char* message, int mode);
140+// DM3
141+// Header
142+extern void dmFile3HeaderRead(FILE* fpt, dmFile* dm, char* message, int mode);
143+//
144+extern void dmFile3TagDirectoryHeaderRead(FILE* fpt, dmFile3TagDirectory* dmRoot, char* message, int mode);
145+extern void dmFile3TagHeaderRead(FILE* fpt, dmFile3Tag* dmTag, char* message, int mode);
146+extern void dmFile3TagRead(FILE* fpt, dmFile3Tag* dmTag, char* message, int mode);
147+
148+// DM4
149+// Header
150+extern void dmFile4HeaderRead(FILE* fpt, dmFile* dm, char* message, int mode);
151+//
152+extern void dmFile4TagDirectoryHeaderRead(FILE* fpt, dmFile4TagDirectory* dmRoot, char* message, int mode);
153+extern void dmFile4TagHeaderRead(FILE* fpt, dmFile4Tag* dmTag, char* message, int mode);
154+extern void dmFile4TagRead(FILE* fpt, dmFile4Tag* dmTag, char* message, int mode);
155+
156+// in dmFileUtil.c
157+extern void dmFileValuePrint(FILE* fpt, void* value, dmFileTagDataType valueType, int n);
103158
104159 /* prototype end */
105160
--- a/src/Objects/DataManip/dmFile/src/dmFileInfo.c
+++ b/src/Objects/DataManip/dmFile/src/dmFileInfo.c
@@ -36,7 +36,7 @@ dmFileInfo(FILE* fpt, dmFile dm, int mode)
3636 break;
3737 }
3838 default: {
39- fprintf(stderr, "%d: Not supported version\n");
39+ fprintf(stderr, "%d: Not supported version\n", dm.version);
4040 break;
4141 }
4242
--- a/src/Objects/DataManip/dmFile/src/dmFileRead.c
+++ b/src/Objects/DataManip/dmFile/src/dmFileRead.c
@@ -10,7 +10,7 @@
1010 #%Z%
1111 */
1212 static char __sccs_id[] = "%Z%dmFileRead ver%I%; Date:%D% %Z%";
13-#undef DEBUG
13+#define DEBUG
1414 #include "genUtil.h"
1515 #include "Memory.h"
1616 #include "../inc/dmFile.h"
@@ -18,6 +18,73 @@ static char __sccs_id[] = "%Z%dmFileRead ver%I%; Date:%D% %Z%";
1818 void
1919 dmFileRead(FILE* fpt, dmFile* dm, char* message, int mode)
2020 {
21+ int i, j;
22+ dmFile3Tag* dmTag;
23+
24+ dmFileHeaderTailRead(fpt, dm, message, mode);
25+
26+ switch(dm->version) {
27+ case 3: {
28+ // Header
29+ dmFile3HeaderRead(fpt, dm, message, mode);
30+ // Root Tag
31+ dmFile3TagDirectoryHeaderRead(fpt, &(dm->RootTag3), message, mode);
32+ for(i=0; i<dm->RootTag3.numberOfTags; i++) {
33+ dmTag = &(dm->RootTag3.Tags[i]);
34+ DEBUGPRINT2("Tags-i: %d/%d\n", i, dm->RootTag3.numberOfTags);
35+ dmFile3TagHeaderRead(fpt, &(dm->RootTag3.Tags[i]), message, mode);
36+ switch(dm->RootTag3.Tags[i].tagID) {
37+ case 0x15: { // tag
38+ DEBUGPRINT("TAG\n");
39+ dmFile3TagRead(fpt, &(dm->RootTag3.Tags[i]), message, mode);
40+ break;
41+ }
42+ case 0x14: { // tag directories
43+ DEBUGPRINT("TAG DIRECTORIES\n");
44+ dm->RootTag3.Tags[i].tagDir = memoryAllocate(sizeof(dmFile3TagDirectory), message);
45+ dmFile3TagDirectoryHeaderRead(fpt, dm->RootTag3.Tags[i].tagDir, message, mode);
46+ DEBUGPRINT1("Number of Tages: %d\n", dm->RootTag3.Tags[i].tagDir->numberOfTags);
47+ for(j=0; j<dm->RootTag3.Tags[i].tagDir->numberOfTags; j++) {
48+ DEBUGPRINT1("Tags-j(in tag directories): %d\n", j);
49+ dmFile3TagHeaderRead(fpt, &(dm->RootTag3.Tags[i].tagDir->Tags[j]), message, mode);
50+ dmFile3TagRead(fpt, &(dm->RootTag3.Tags[i].tagDir->Tags[j]), message, mode);
51+ }
52+ break;
53+ }
54+ case 0x0: {
55+ DEBUGPRINT("FILE END\n")
56+ return;
57+ break;
58+ }
59+ default: {
60+ dmFile3TagRead(fpt, &(dm->RootTag3.Tags[i]), message, mode);
61+ fprintf(stderr, "Not supported tagID: %X\n", dm->RootTag3.Tags[i].tagID);
62+ //exit(EXIT_FAILURE);
63+ break;
64+ }
65+ }
66+ }
67+ break;
68+ }
69+ case 4: {
70+ // Header
71+ dmFile4HeaderRead(fpt, dm, message, mode);
72+ // Root Tag
73+ dmFile4TagDirectoryHeaderRead(fpt, &(dm->RootTag4), message, mode);
74+ break;
75+ }
76+ default: {
77+ fprintf(stderr, "Not supported version: %d\n", dm->version);
78+ break;
79+ }
80+ }
81+}
82+
83+
84+void
85+dmFileHeaderTailRead(FILE* fpt, dmFile* dm, char* message, int mode)
86+{
87+ DEBUGPRINT("dmFileHeaderTailRead\n");
2188 fseek(fpt, 0L, SEEK_SET);
2289 fread(&(dm->version), sizeof(dmFileInteger4), 1, fpt);
2390 #ifdef II
@@ -31,77 +98,181 @@ dmFileRead(FILE* fpt, dmFile* dm, char* message, int mode)
3198 fprintf(stderr, "This file is not dm3/dm4: version %d \n", dm->version);
3299 exit(EXIT_FAILURE);
33100 }
101+}
34102
35- switch(dm->version) {
36- case 3: {
37- // Header
38- fseek(fpt, 0L, SEEK_SET);
39- if(12!=sizeof(dm->Header4)) {
40- fprintf(stderr, "Size is strange: %lu expected 12\n", sizeof(dm->Header4));
41- fread(&(dm->Header3.version), sizeof(dm->Header3.version), 1, fpt);
42- fread(&(dm->Header3.rootLength), sizeof(dm->Header3.rootLength), 1, fpt);
43- fread(&(dm->Header3.byteOrder), sizeof(dm->Header3.byteOrder), 1, fpt);
44- } else {
45- DEBUGPRINT1("Header3 Size: %lu expect 12\n", sizeof(dm->Header4));
46- fread(&(dm->Header3), sizeof(dm->Header3), 1, fpt);
47- }
103+void
104+dmFile3HeaderRead(FILE* fpt, dmFile* dm, char* message, int mode)
105+{
106+ DEBUGPRINT("dmFile3HeaderRead\n");
107+ // Header
108+ fseek(fpt, 0L, SEEK_SET);
109+ if(12!=sizeof(dm->Header3)) {
110+ fprintf(stderr, "Size is strange: %lu expected 12\n", sizeof(dm->Header4));
111+ fread(&(dm->Header3.version), sizeof(dm->Header3.version), 1, fpt);
112+ fread(&(dm->Header3.rootLength), sizeof(dm->Header3.rootLength), 1, fpt);
113+ fread(&(dm->Header3.byteOrder), sizeof(dm->Header3.byteOrder), 1, fpt);
114+ } else {
115+ DEBUGPRINT1("Header3 Size: %lu expect 12\n", sizeof(dm->Header4));
116+ fread(&(dm->Header3), sizeof(dm->Header3), 1, fpt);
117+ }
48118 #ifdef II
49- memoryByteSwap(&(dm->Header3.version), sizeof(dmFileInteger4), 1);
50- memoryByteSwap(&(dm->Header3.rootLength), sizeof(dmFileInteger4), 1);
51- memoryByteSwap(&(dm->Header3.byteOrder), sizeof(dmFileInteger4), 1);
119+ memoryByteSwap(&(dm->Header3.version), sizeof(dmFileInteger4), 1);
120+ memoryByteSwap(&(dm->Header3.rootLength), sizeof(dmFileInteger4), 1);
121+ memoryByteSwap(&(dm->Header3.byteOrder), sizeof(dmFileInteger4), 1);
52122 #endif
53- DEBUGPRINT1("version: %d\n", dm->Header3.version);
54- DEBUGPRINT1("RootLength: %d\n", dm->Header3.rootLength);
55- DEBUGPRINT1("ByteOrder: %d\n", dm->Header3.byteOrder);
123+ DEBUGPRINT1("version: %d\n", dm->Header3.version);
124+ DEBUGPRINT1("RootLength: %d\n", dm->Header3.rootLength);
125+ DEBUGPRINT1("ByteOrder: %d\n", dm->Header3.byteOrder);
126+}
56127
57- // Root Tag
58- fread(&(dm->RootTag3.sortf), sizeof(dmFileInteger1), 1, fpt);
59- fread(&(dm->RootTag3.closef), sizeof(dmFileInteger1), 1, fpt);
60- fread(&(dm->RootTag3.numberOfTags), sizeof(dmFileInteger4), 1, fpt);
128+
129+void
130+dmFile4HeaderRead(FILE* fpt, dmFile* dm, char* message, int mode)
131+{
132+ // Header
133+ fseek(fpt, 0L, SEEK_SET);
134+ if(16!=sizeof(dm->Header4)) {
135+ fprintf(stderr, "Size is strange: %lu expected 16\n", sizeof(dm->Header4));
136+ fread(&(dm->Header4.version), sizeof(dm->Header4.version), 1, fpt);
137+ fread(&(dm->Header4.rootLength), sizeof(dm->Header4.rootLength), 1, fpt);
138+ fread(&(dm->Header4.byteOrder), sizeof(dm->Header4.byteOrder), 1, fpt);
139+ } else {
140+ DEBUGPRINT1("Header4 Size: %lu expect 16\n", sizeof(dm->Header4));
141+ fread(&(dm->Header4), sizeof(dm->Header4), 1, fpt);
142+ }
61143 #ifdef II
62- memoryByteSwap(&(dm->RootTag3.numberOfTags), sizeof(dmFileInteger4), 1);
144+ memoryByteSwap(&(dm->Header4.version), sizeof(dmFileInteger4), 1);
145+ memoryByteSwap(&(dm->Header4.rootLength), sizeof(dmFileInteger8), 1);
146+ memoryByteSwap(&(dm->Header4.byteOrder), sizeof(dmFileInteger4), 1);
63147 #endif
64- DEBUGPRINT1("sortf: %d\n", dm->RootTag3.sortf);
65- DEBUGPRINT1("closef: %d\n", dm->RootTag3.closef);
66- DEBUGPRINT1("numberOfTags: %d\n", dm->RootTag3.numberOfTags);
67- break;
68- }
69- case 4: {
70- // Header
71- fseek(fpt, 0L, SEEK_SET);
72- if(16!=sizeof(dm->Header4)) {
73- fprintf(stderr, "Size is strange: %lu expected 16\n", sizeof(dm->Header4));
74- fread(&(dm->Header4.version), sizeof(dm->Header4.version), 1, fpt);
75- fread(&(dm->Header4.rootLength), sizeof(dm->Header4.rootLength), 1, fpt);
76- fread(&(dm->Header4.byteOrder), sizeof(dm->Header4.byteOrder), 1, fpt);
77- } else {
78- DEBUGPRINT1("Header4 Size: %lu expect 16\n", sizeof(dm->Header4));
79- fread(&(dm->Header4), sizeof(dm->Header4), 1, fpt);
80- }
148+ DEBUGPRINT1("version: %d\n", dm->Header4.version);
149+ DEBUGPRINT1("RootLength: %lld\n", dm->Header4.rootLength);
150+ DEBUGPRINT1("ByteOrder: %d\n", dm->Header4.byteOrder);
151+}
152+
153+void
154+dmFile3TagDirectoryHeaderRead(FILE* fpt, dmFile3TagDirectory* RootTag3, char* message, int mode)
155+{
156+ DEBUGPRINT("dmFileTag3RootTagRead\n");
157+ // Root Tag
158+ fread(&(RootTag3->sortf), sizeof(dmFileInteger1), 1, fpt);
159+ fread(&(RootTag3->closef), sizeof(dmFileInteger1), 1, fpt);
160+ fread(&(RootTag3->numberOfTags), sizeof(dmFileInteger4), 1, fpt);
81161 #ifdef II
82- memoryByteSwap(&(dm->Header4.version), sizeof(dmFileInteger4), 1);
83- memoryByteSwap(&(dm->Header4.rootLength), sizeof(dmFileInteger8), 1);
84- memoryByteSwap(&(dm->Header4.byteOrder), sizeof(dmFileInteger4), 1);
162+ memoryByteSwap(&(RootTag3->numberOfTags), sizeof(dmFileInteger4), 1);
85163 #endif
86- DEBUGPRINT1("version: %d\n", dm->Header4.version);
87- DEBUGPRINT1("RootLength: %lld\n", dm->Header4.rootLength);
88- DEBUGPRINT1("ByteOrder: %d\n", dm->Header4.byteOrder);
164+ DEBUGPRINT1("sortf: %d\n", RootTag3->sortf);
165+ DEBUGPRINT1("closef: %d\n", RootTag3->closef);
166+ DEBUGPRINT1("numberOfTags: %d\n", RootTag3->numberOfTags);
167+ RootTag3->Tags = (dmFile3Tag*)memoryAllocate(sizeof(dmFile3Tag)*RootTag3->numberOfTags, "in dmFileRead");
168+}
89169
90- // Root Tag
91- fread(&(dm->RootTag4.sortf), sizeof(dmFileInteger1), 1, fpt);
92- fread(&(dm->RootTag4.closef), sizeof(dmFileInteger1), 1, fpt);
93- fread(&(dm->RootTag4.numberOfTags), sizeof(dmFileInteger8), 1, fpt);
170+void
171+dmFile4TagDirectoryHeaderRead(FILE* fpt, dmFile4TagDirectory* RootTag4, char* message, int mode)
172+{
173+ DBUGPRINT("dmFile4TagDirectoryHeaderRead");
174+ // Root Tag
175+ fread(&(RootTag4->sortf), sizeof(dmFileInteger1), 1, fpt);
176+ fread(&(RootTag4->closef), sizeof(dmFileInteger1), 1, fpt);
177+ fread(&(RootTag4->numberOfTags), sizeof(dmFileInteger8), 1, fpt);
178+#ifdef II
179+ memoryByteSwap(&(RootTag4->numberOfTags), sizeof(dmFileInteger8), 1);
180+#endif
181+ DEBUGPRINT1("sortf: %d\n", RootTag4->sortf);
182+ DEBUGPRINT1("closef: %d\n", RootTag4->closef);
183+ DEBUGPRINT1("numberOfTags: %lld\n", RootTag4->numberOfTags);
184+ RootTag4->Tags = (dmFile4Tag*)memoryAllocate(sizeof(dmFile4Tag)*RootTag4->numberOfTags, "in dmFileRead");
185+}
186+
187+void
188+dmFile3TagHeaderRead(FILE* fpt, dmFile3Tag* dmTag, char* message, int mode)
189+{
190+ DEBUGPRINT("dmFileTag3HeaderRead\n");
191+ fread(&(dmTag->tagID), sizeof(dmFileInteger1), 1, fpt);
192+ fread(&(dmTag->tagNameLength), sizeof(dmFileInteger2), 1, fpt);
94193 #ifdef II
95- memoryByteSwap(&(dm->RootTag4.numberOfTags), sizeof(dmFileInteger8), 1);
194+ memoryByteSwap(&(dmTag->tagNameLength), sizeof(dmFileInteger2), 1);
96195 #endif
97- DEBUGPRINT1("sortf: %d\n", dm->RootTag4.sortf);
98- DEBUGPRINT1("closef: %d\n", dm->RootTag4.closef);
99- DEBUGPRINT1("numberOfTags: %lld\n", dm->RootTag4.numberOfTags);
196+ if(0<dmTag->tagNameLength) {
197+ dmTag->tagName = (char*)memoryAllocate(sizeof(char)*(dmTag->tagNameLength+1), "in dmFileRead");
198+ fread(dmTag->tagName, sizeof(char), dmTag->tagNameLength, fpt);
199+ }
200+ DEBUGPRINT3("tagID(hex) %X tagNameLength %d tagName %s\n", dmTag->tagID, dmTag->tagNameLength, dmTag->tagName);
201+}
202+
203+void
204+dmFile3TagRead(FILE* fpt, dmFile3Tag* dmTag, char* message, int mode)
205+{
206+ int j;
207+ DEBUGPRINT("dmFileTag3Read\n");
208+ fread(dmTag->seperator, sizeof(char), 4, fpt);
209+ DEBUGPRINT1("%s\n",dmTag->seperator);
210+ if(0!=strncmp(dmTag->seperator, "%%%%", 4)) {
211+ fprintf(stderr, "Not supported : Strange!!!\n");
212+ }
213+ fread(&(dmTag->ninfo), sizeof(dmFileInteger4), 1, fpt);
214+#ifdef II
215+ memoryByteSwap(&(dmTag->ninfo), sizeof(dmFileInteger4), 1);
216+#endif
217+ DEBUGPRINT1("tag ninfo %d\n", dmTag->ninfo);
218+ if(0==dmTag->ninfo) {
219+ DEBUGPRINT1("tag ninfo is zero: %d\n", dmTag->ninfo);
220+ return;
221+ }
222+ dmTag->info = (dmFileInteger4*)memoryAllocate(sizeof(dmFileInteger4)*dmTag->ninfo, "in dmFileRead");
223+ fread(dmTag->info, sizeof(dmFileInteger4), dmTag->ninfo, fpt);
224+#ifdef II
225+ memoryByteSwap(dmTag->info, sizeof(dmFileInteger4), dmTag->ninfo);
226+#endif
227+ DEBUGPRINT2("tag: info[0] %X ninfo %d\n", dmTag->info[0], dmTag->ninfo);
228+ switch(dmTag->info[0]) {
229+ case dmFileTagDataTypeStruct: {
230+ DEBUGPRINT1("Struct: numEntry %d\n", dmTag->info[2]);
231+ // dmTag->info[2] ; num of Entries
232+ // dmTag->info[2*n + 4] ; data type of value-n
233+ dmTag->value2 = (void*)memoryAllocate(sizeof(void*)*dmTag->info[2], "in dmFileRead");
234+ for(j=0; j<dmTag->info[2]; j++) {
235+ DEBUGPRINT2("value %d type %d\n", j, dmTag->info[2*j+4]);
236+ dmTag->value2[j] = memoryAllocate(__dmFileTagDataTypeSize[dmTag->info[2*j+4]], "in dmFileRead");
237+ fread(dmTag->value2[j], __dmFileTagDataTypeSize[dmTag->info[2*j+4]], 1, fpt);
238+#ifdef II
239+ memoryByteSwap(dmTag->value2[j], __dmFileTagDataTypeSize[dmTag->info[2*j+4]], 1);
240+#endif
241+#ifdef DEBUG
242+ dmFileValuePrint(stderr, dmTag->value2[j], __dmFileTagDataTypeSize[dmTag->info[2*j+4]], 1);
243+#endif
244+ }
245+ break;
246+ }
247+ case dmFileTagDataTypeArray: {
248+ DEBUGPRINT1("ARRAY %d\n", dmTag->info[0]);
249+ // dmTag->info[0] ; data type
250+ // dmTag->info[1] ; data array size
251+ if(0<dmTag->info[1]) {
252+ dmTag->value = memoryAllocate(__dmFileTagDataTypeSize[dmTag->info[0]]*dmTag->info[1], "in dmFileRead");
253+ fread(dmTag->value, __dmFileTagDataTypeSize[dmTag->info[0]], dmTag->info[1], fpt);
254+#ifdef DEBUG
255+ dmFileValuePrint(stderr, dmTag->value, __dmFileTagDataTypeSize[dmTag->info[0]], dmTag->info[1]);
256+#endif
257+ } else {
258+ fprintf(stderr, "Not supported data type for array: %d\n", dmTag->info[1]);
259+ }
100260 break;
101261 }
262+ case dmFileTagDataTypeString: {
263+ //dmTag->value = memoryAllocate(__dmFileTagDataTypeSize[dmTag->info[0]], "in dmFileRead");
264+ //fread(dmTag->value, __dmFileTagDataTypeSize[dmTag->info[0]], 1, fpt);
265+ //dmFileValuePrint(stderr, dmTag->value, __dmFileTagDataTypeSize[dmTag->info[0]], 1);
266+ //fprintf(stderr, "Not supported tagType: %d\n", dmTag->info[j]);
267+ break;
268+ }
102269 default: {
103- fprintf(stderr, "Not supported version: %d\n", dm->version);
270+ dmTag->value = memoryAllocate(__dmFileTagDataTypeSize[dmTag->info[0]], "in dmFileRead");
271+ fread(dmTag->value, __dmFileTagDataTypeSize[dmTag->info[0]], 1, fpt);
272+ dmFileValuePrint(stderr, dmTag->value, __dmFileTagDataTypeSize[dmTag->info[0]], 1);
273+ //fprintf(stderr, "Not supported tagType: %d\n", dmTag->info[j]);
104274 break;
105275 }
106276 }
107277 }
278+
--- /dev/null
+++ b/src/Objects/DataManip/dmFile/src/dmFileUtil.c
@@ -0,0 +1,90 @@
1+/*
2+# %M% %Y% %I%
3+# The latest update : %G% at %U%
4+#
5+#%Z% dmFileUtil ver %I%
6+#%Z% Created by
7+#%Z%
8+#%Z% Usage : dmFileUtil
9+#%Z% Attention
10+#%Z%
11+*/
12+static char __sccs_id[] = "%Z%dmFileUtil ver%I%; Date:%D% %Z%";
13+
14+#include "../inc/dmFile.h"
15+
16+void
17+dmFileValuePrint(FILE* fpt, void* value, dmFileTagDataType valueType, int n)
18+{
19+ int i;
20+ switch(valueType) {
21+ case dmFileTagDataTypeInt2: {
22+ for(i=0; i<n; i++) {
23+ fprintf(fpt, "%d ", ((dmFileInteger2*)value)[i]);
24+ }
25+ break;
26+ }
27+ case dmFileTagDataTypeInt4: {
28+ for(i=0; i<n; i++) {
29+ fprintf(fpt, "%d ", ((dmFileInteger4*)value)[i]);
30+ }
31+ break;
32+ }
33+ case dmFileTagDataTypeUInt2: {
34+ for(i=0; i<n; i++) {
35+ fprintf(fpt, "%u ", ((dmFileInteger2*)value)[i]);
36+ }
37+ break;
38+ }
39+ case dmFileTagDataTypeUInt4: {
40+ for(i=0; i<n; i++) {
41+ fprintf(fpt, "%u ", ((dmFileInteger4*)value)[i]);
42+ }
43+ break;
44+ }
45+ case dmFileTagDataTypeReal4: {
46+ for(i=0; i<n; i++) {
47+ fprintf(fpt, "%f ", ((float*)value)[i]);
48+ }
49+ break;
50+ }
51+ case dmFileTagDataTypeReal8: {
52+ for(i=0; i<n; i++) {
53+ fprintf(fpt, "%f ", ((double*)value)[i]);
54+ }
55+ break;
56+ }
57+ case dmFileTagDataTypeBool1: {
58+ for(i=0; i<n; i++) {
59+ fprintf(fpt, "%d ", ((char*)value)[i]);
60+ }
61+ break;
62+ }
63+ case dmFileTagDataTypeChar1: {
64+ for(i=0; i<n; i++) {
65+ fprintf(fpt, "%c ", ((char*)value)[i]);
66+ }
67+ break;
68+ }
69+ case dmFileTagDataTypeInt1: {
70+ for(i=0; i<n; i++) {
71+ fprintf(fpt, "%d ", ((char*)value)[i]);
72+ }
73+ break;
74+ }
75+ case dmFileTagDataTypeInt8: {
76+ for(i=0; i<n; i++) {
77+ fprintf(fpt, "%d ", ((char*)value)[i]);
78+ }
79+ break;
80+ }
81+ case dmFileTagDataTypeString: {
82+ fprintf(fpt, "%s", (char*)value);
83+ }
84+ default: {
85+ fprintf(stderr, "Not supported valueType: %d\n", valueType);
86+ break;
87+ }
88+ }
89+ fprintf(fpt, "\n");
90+}
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageShapePCA.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageShapePCA.c
@@ -59,27 +59,71 @@ lmrcImageShapePCA(mrcImage* in, lmrcImageShapePCAInfo* linfo, int mode)
5959 arrayDataSet2(X1, 2, i, data);
6060 }
6161 arrayPCA(&linfo->u, &linfo->C, &linfo->Lambda, &X1, &linfo->Average, 0);
62+
63+ return 0;
6264 }
6365
6466 int
6567 lmrcImageShapePCAResultsPrint(FILE* fpt, lmrcImageShapePCAInfo* linfo, int mode)
6668 {
67- double sum;
69+ double sum, sum2;
70+ double lambda[3];
71+ int i;
72+
73+ fprintf(fpt, "# PCA Results");
74+ fprintf(fpt, "Convariace Matrix: ");
75+ arrayWriteToFile(fpt, &linfo->C, "lmrcImageShapePCAResultsPrint");
76+ fprintf(fpt, "UnitVector: one unit vector per line, from 1st ");
77+ arrayWriteToFile(fpt, &linfo->u, "lmrcImageShapePCAResultsPrint");
78+ fprintf(fpt, "Lambda: 1st 2nd 3rd");
79+ arrayWriteToFile(fpt, &linfo->Lambda, "lmrcImageShapePCAResultsPrint");
80+ fprintf(fpt, "Average: ");
81+ arrayWriteToFile(fpt, &linfo->Average, "lmrcImageShapePCAResultsPrint");
82+ fprintf(fpt, "Normalized Lambda: 1st 2nd 3rd\n");
83+
84+ lambda[0] = arrayDataGet1(linfo->Lambda, 0);
85+ lambda[1] = arrayDataGet1(linfo->Lambda, 1);
86+ lambda[2] = arrayDataGet1(linfo->Lambda, 2);
87+ sum = 0;
88+ for(i=0; i<3; i++) {
89+ sum += lambda[i];
90+ }
91+ sum2 = 0;
92+ for(i=0; i<3; i++) {
93+ lambda[i] /= sum;
94+ sum2 += SQR(lambda[i]);
95+ }
96+ for(i=0; i<3; i++) {
97+ fprintf(fpt, "%15.6f ", lambda[i]);
98+ }
99+ fprintf(fpt, "\n");
100+
101+ if(mode&0x1) {
102+ fprintf(fpt, "logS(SphereIndex): %15.6f\n", -log10(1/(lambda[0]*lambda[1] + lambda[1]*lambda[2] +lambda[2]*lambda[0] )));
103+ fprintf(fpt, "exp(S-1)(SphereIndex): %15.6f\n", 1.0/exp(1/(lambda[0]*lambda[1] + lambda[1]*lambda[2] +lambda[2]*lambda[0] )-1));
104+ fprintf(fpt, "SphereIndex(var): %15.6f\n", 1.0/(SQR(lambda[0] - lambda[1]) + SQR(lambda[1]-lambda[2]) + SQR(lambda[2]-lambda[0])));
105+ fprintf(fpt, "Log(SphereIndex(var)): %15.6f\n", -log10(SQR(lambda[0] - lambda[1]) + SQR(lambda[1]-lambda[2]) + SQR(lambda[2]-lambda[0])));
106+ fprintf(fpt, "SphereIndex(var): %15.6f\n", 1.0/(SQR(lambda[0] - lambda[1]) + SQR(lambda[1]-lambda[2]) + SQR(lambda[2]-lambda[0])));
107+ fprintf(fpt, "SphereIndex(0.33): %15.6f\n", 1.0/(SQR(lambda[0] - 1.0/3) + SQR(lambda[1]-1.0/3) + SQR(lambda[2]-1.0/3)));
108+ fprintf(fpt, "Log(SphereIndex(0.33)): %15.6f\n", -log10(SQR(lambda[0] - 1.0/3) + SQR(lambda[1]-1.0/3) + SQR(lambda[2]-1.0/3)));
109+ }
110+ if(mode&0x2) {
111+ fprintf(fpt, "DiskIndex: %15.6f\n", 1.0/(lambda[2]/lambda[0]*lambda[2]/lambda[1]));
112+ fprintf(fpt, "logD(DiskIndex): %15.6f\n", -log10(lambda[2]/lambda[0]*lambda[2]/lambda[1]));
113+ fprintf(fpt, "DiskIndex(var): %15.6f\n", 1.0/(SQR(lambda[0]-lambda[1]) + SQR(lambda[2] )));
114+ fprintf(fpt, "Log(DiskIndex(var)): %15.6f\n", -log10(SQR(lambda[0]-lambda[1]) + SQR(lambda[2] )));
115+ fprintf(fpt, "DiskIndex(0.5): %15.6f\n", 1.0/(SQR(lambda[0]-0.5) + SQR(lambda[1]-0.5) + SQR(lambda[2] )));
116+ fprintf(fpt, "Log(DiskIndex(0.5)): %15.6f\n", -log10(SQR(lambda[0]-0.5) + SQR(lambda[1]-0.5) + SQR(lambda[2] )));
117+ }
118+ if(mode&0x4) {
119+ fprintf(fpt, "CylinderIndex: %15.6f\n", 1.0/(lambda[1]/lambda[0]*lambda[2]/lambda[0]));
120+ fprintf(fpt, "logC(CylinderIndex): %15.6f\n", -log10(lambda[1]/lambda[0]*lambda[2]/lambda[0]));
121+ fprintf(fpt, "CylinderIndex(var) : %15.6f\n", 1.0/(SQR(lambda[0] -1) + SQR(lambda[1] - lambda[2])));
122+ fprintf(fpt, "Log(CylinderIndex(var) : %15.6f\n", -log10(SQR(lambda[0] -1) +SQR(lambda[1] - lambda[2])));
123+ fprintf(fpt, "CylinderIndex(1.0) : %15.6f\n", 1.0/(SQR(lambda[0] -1) + SQR(lambda[1]) + SQR(lambda[2])));
124+ fprintf(fpt, "Log(CylinderIndex(1.0)) : %15.6f\n", -log10(SQR(lambda[0] -1) +SQR(lambda[1]) + SQR(lambda[2])));
125+ }
126+
68127
69- fprintf(fpt, "# PCA Results");
70- fprintf(fpt, "Convariace Matrix: ");
71- arrayWriteToFile(fpt, &linfo->C, "lmrcImageShapePCAResultsPrint");
72- fprintf(fpt, "UnitVector: one unit vector per line, from 1st ");
73- arrayWriteToFile(fpt, &linfo->u, "lmrcImageShapePCAResultsPrint");
74- fprintf(fpt, "Lambda: 1st 2nd 3rd");
75- arrayWriteToFile(fpt, &linfo->Lambda, "lmrcImageShapePCAResultsPrint");
76- fprintf(fpt, "Average: ");
77- arrayWriteToFile(fpt, &linfo->Average, "lmrcImageShapePCAResultsPrint");
78- fprintf(fpt, "Normalized Lambda: 1st 2nd 3rd\n");
79- sum = arrayDataGet1(linfo->Lambda, 0);
80- sum += arrayDataGet1(linfo->Lambda, 1);
81- sum += arrayDataGet1(linfo->Lambda, 2);
82- fprintf(fpt, "%15.6f ", arrayDataGet1(linfo->Lambda, 0)/sum);
83- fprintf(fpt, "%15.6f ", arrayDataGet1(linfo->Lambda, 1)/sum);
84- fprintf(fpt, "%15.6f \n", arrayDataGet1(linfo->Lambda, 2)/sum);
128+ return 0;
85129 }
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -580,3 +580,5 @@ WORLDNAME=Tools
580580 WORLDNAME=Tools
581581 WORLDNAME=Tools
582582 WORLDNAME=Tools
583+WORLDNAME=Tools
584+WORLDNAME=Tools
--- a/src/Tools/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
1-include ../Config/Define.inc
2-include Config/Define.inc
3-include .Source
4-
5-include Config/Target.inc
--- /dev/null
+++ b/src/Tools/Makefile
@@ -0,0 +1 @@
1+/Users/tacyas/Eos/src/Config/Template/ToolsHomeTemplate.Dir/Makefile
\ No newline at end of file
--- a/src/Tools/filter/dmInfo/src/dmInfo.html
+++ b/src/Tools/filter/dmInfo/src/dmInfo.html
@@ -1,18 +1 @@
1-<HTML>
2-<HEAD>
3-<TITLE>dmInfo</TITLE>
4-</HEAD>
5-<BODY>
6-<H1>dmInfo</H1>
7-<H2>Usage</H2>
8-<PRE>
9-Usage: dmInfo
10-Options:
11- [-i[nput] In (NULL ).as(inFile::dmFile ) ] :Essential :Input:dfFile(dm3|dm4)
12- [-o[utput] Out (stdout ).as(outFile::ASCII ) ] :Optional :Output:
13- [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile
14- [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode
15------ Additional Usage -----
16-</PRE>
17-</BODY>
18-</HTML>
1+/bin/bash: dmInfo: No such file or directory
--- a/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/mrcImageMeanFreePathCalc.c
+++ b/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/mrcImageMeanFreePathCalc.c
@@ -131,7 +131,17 @@ additionalUsage()
131131 void
132132 lmrcImageMeanFreePathCalcModePrint(FILE* fpt)
133133 {
134+ fprintf(fpt, ">>>> mode \n");
134135 fprintf(fpt, "%d: AlongZ-axis\n", MeanFreePathCalcModeAlongZaxis);
136+ fprintf(fpt, "+%d: Length is shown in real using HeaderLength \n", MeanFreePathCalcModeRealLength);
137+
138+ fprintf(fpt, ">>>> line shape\n");
139+ fprintf(fpt, "%d: LineShape-Rectangle\n", lmrcImageMeanFreePathCalcLineShapeRectangle);
140+ fprintf(fpt, "%d: LineShape-Disk\n", lmrcImageMeanFreePathCalcLineShapeDisk);
141+ fprintf(fpt, ">>>> line mode\n");
142+ fprintf(fpt, "%d: LineMode-And \n", lmrcImageMeanFreePathCalcLineModeAnd);
143+ fprintf(fpt, "%d: LineMode-Or \n", lmrcImageMeanFreePathCalcLineModeOr);
144+ fprintf(fpt, "%d: LineMode-GE(Greater than or equal to) \n", lmrcImageMeanFreePathCalcLineModeGE);
135145 }
136146
137147 void
@@ -424,7 +434,9 @@ double
424434 lmrcImageMeanFreePathCalcBWEvaluation(mrcImage* in, lmrcImageMeanFreePathCalcInfo* linfo, lmrcImageMeanFreePathCalcMode mode)
425435 {
426436 double data, data0;
437+ double rx, ry, r0x, r0y;
427438 mrcImageParaTypeReal srcx, srcy;
439+ int max;
428440
429441 switch(linfo->LineShape) {
430442 case lmrcImageMeanFreePathCalcLineShapeRectangle: {
@@ -437,6 +449,101 @@ lmrcImageMeanFreePathCalcBWEvaluation(mrcImage* in, lmrcImageMeanFreePathCalcInf
437449 data *= data0;
438450 }
439451 }
452+ if(0<data) data = 1;
453+ break;
454+ }
455+ case lmrcImageMeanFreePathCalcLineModeOr: {
456+ data = 0;
457+ for(srcy=linfo->min.y; srcy<linfo->max.y; srcy++) {
458+ for(srcx=linfo->min.x; srcx<linfo->max.x; srcx++) {
459+ mrcPixelDataGet(in, srcx, srcy, linfo->cur.z, &data0, mrcPixelRePart, mrcPixelHowNearest);
460+ data += data0;
461+ if(0<data) break;
462+ }
463+ if(0<data) break;
464+ }
465+ if(0<data) data = 1;
466+ break;
467+ }
468+ case lmrcImageMeanFreePathCalcLineModeGE: {
469+ data = 0;
470+ max = 0;
471+ for(srcy=linfo->min.y; srcy<linfo->max.y; srcy++) {
472+ for(srcx=linfo->min.x; srcx<linfo->max.x; srcx++) {
473+ mrcPixelDataGet(in, srcx, srcy, linfo->cur.z, &data0, mrcPixelRePart, mrcPixelHowNearest);
474+ data += data0;
475+ max++;
476+ }
477+ }
478+ if(max/2<=data) {
479+ data = 1;
480+ }
481+ break;
482+ }
483+ default: {
484+ fprintf(stderr, "Not supported Line Mode: %d\n", linfo->LineMode);
485+ exit(EXIT_FAILURE);
486+ break;
487+ }
488+ }
489+ break;
490+ }
491+ case lmrcImageMeanFreePathCalcLineShapeDisk: {
492+ r0x = (linfo->max.x - linfo->cur.x);
493+ r0y = (linfo->max.y - linfo->cur.y);
494+ switch(linfo->LineMode) {
495+ case lmrcImageMeanFreePathCalcLineModeAnd: {
496+ data = 1;
497+ for(srcy=linfo->min.y; srcy<=linfo->max.y; srcy++) {
498+ ry = SQR((srcy - linfo->cur.y)/r0y);
499+ for(srcx=linfo->min.x; srcx<linfo->max.x; srcx++) {
500+ rx = SQR((srcx - linfo->cur.x)/r0x);
501+
502+ if(rx + ry <= 1) {
503+ mrcPixelDataGet(in, srcx, srcy, linfo->cur.z, &data0, mrcPixelRePart, mrcPixelHowNearest);
504+ data *= data0;
505+ }
506+ }
507+ }
508+ if(0<data) data = 1;
509+ break;
510+ }
511+ case lmrcImageMeanFreePathCalcLineModeOr: {
512+ data = 0;
513+ for(srcy=linfo->min.y; srcy<linfo->max.y; srcy++) {
514+ ry = SQR((srcy - linfo->cur.y)/r0y);
515+ for(srcx=linfo->min.x; srcx<linfo->max.x; srcx++) {
516+ rx = SQR((srcx - linfo->cur.x)/r0x);
517+
518+ if(rx + ry <= 1) {
519+ mrcPixelDataGet(in, srcx, srcy, linfo->cur.z, &data0, mrcPixelRePart, mrcPixelHowNearest);
520+ data += data0;
521+ if(0<data) break;
522+ }
523+ }
524+ if(0<data) break;
525+ }
526+ if(0<data) data = 1;
527+ break;
528+ }
529+ case lmrcImageMeanFreePathCalcLineModeGE: {
530+ data = 0;
531+ max = 0;
532+ for(srcy=linfo->min.y; srcy<linfo->max.y; srcy++) {
533+ ry = SQR((srcy - linfo->cur.y)/r0y);
534+ for(srcx=linfo->min.x; srcx<linfo->max.x; srcx++) {
535+ rx = SQR((srcx - linfo->cur.x)/r0x);
536+
537+ if(rx + ry <= 1) {
538+ mrcPixelDataGet(in, srcx, srcy, linfo->cur.z, &data0, mrcPixelRePart, mrcPixelHowNearest);
539+ data += data0;
540+ max++;
541+ }
542+ }
543+ }
544+ if(max/2<=data) {
545+ data = 1;
546+ }
440547 break;
441548 }
442549 default: {
--- a/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/mrcImageMeanFreePathCalc.html
+++ b/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/mrcImageMeanFreePathCalc.html
@@ -21,7 +21,16 @@ Options:
2121 [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile
2222 [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode
2323 ----- Additional Usage -----
24+>>>> mode
2425 0: AlongZ-axis
26++16: Length is shown in real using HeaderLength
27+>>>> line shape
28+0: LineShape-Rectangle
29+1: LineShape-Disk
30+>>>> line mode
31+0: LineMode-And
32+1: LineMode-Or
33+2: LineMode-GE(Greater than or equal to)
2534 </PRE>
2635 </BODY>
2736 </HTML>
--- a/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/test/Makefile
@@ -3,7 +3,7 @@ include ../../../Config/Define.inc
33 include ../../../../Config/Define.inc
44 include ../../../../../Config/Define.inc
55
6-all: help exec exec2
6+all: help exec exec2 exec3
77
88 help:
99 @echo "----- Help Message Check -----"
@@ -21,6 +21,15 @@ exec2:
2121 ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.mfp216 -m 16 -Ow data/test.white216 -Owe data/test.whiteEdge216 -Ob data/test.black216 -Obe data/test.blackEdge216 -lt 2 2
2222 @echo "----- Calc check -----"
2323
24+exec3:
25+ @echo "----- Execution Check -----"
26+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.mfp3-00 -m 0 -Ow data/test.white3-00 -Owe data/test.whiteEdge3-00 -Ob data/test.black3-00 -Obe data/test.blackEdge3-00 -lt 3 3 -ls 0 -lm 0
27+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.mfp3-01 -m 0 -Ow data/test.white3-01 -Owe data/test.whiteEdge3-01 -Ob data/test.black3-01 -Obe data/test.blackEdge3-01 -lt 3 3 -ls 0 -lm 1
28+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.mfp3-02 -m 0 -Ow data/test.white3-02 -Owe data/test.whiteEdge3-02 -Ob data/test.black3-02 -Obe data/test.blackEdge3-02 -lt 3 3 -ls 0 -lm 2
29+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.mfp3-10 -m 0 -Ow data/test.white3-10 -Owe data/test.whiteEdge3-10 -Ob data/test.black3-10 -Obe data/test.blackEdge3-10 -lt 3 3 -ls 1 -lm 0
30+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.mfp3-11 -m 0 -Ow data/test.white3-11 -Owe data/test.whiteEdge3-11 -Ob data/test.black3-11 -Obe data/test.blackEdge3-11 -lt 3 3 -ls 1 -lm 1
31+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.mfp3-12 -m 0 -Ow data/test.white3-12 -Owe data/test.whiteEdge3-12 -Ob data/test.black3-12 -Obe data/test.blackEdge3-12 -lt 3 3 -ls 1 -lm 2
32+
2433 init:
2534 pdb2mrc -i data/121p.pdb2 -o data/test.mrc -nx 32 -ny 32 -nz 32 -dx 2 -dy 2 -dz 2 -Sx -32 -Sy -32 -Sz -32 -sig 1.6 -w 1.0
2635 mrcImageBinalization -i data/test.mrc -o data/test.bin -m 32
--- a/src/Tools/mrcImage/mrcImageShapePCA/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImageShapePCA/Config/OptionControlFile
@@ -3,5 +3,5 @@
33 "-i","-i[nput]","Input: mrcImage","Essential","1","1","In","inFile::mrcImage","NULL"
44 "-o","-o[utput]","Output: ASCII","Optional","1","1","Out","outFile::ASCII","stdout"
55 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
6-"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
6+"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","1"
77 "-C","-C[ontour]","Contour","Variable","1","1","Contour","Real","1.0"
--- a/src/Tools/mrcImage/mrcImageShapePCA/src/init.c
+++ b/src/Tools/mrcImage/mrcImageShapePCA/src/init.c
@@ -15,7 +15,7 @@ init0(mrcImageShapePCAInfo* info)
1515 info->fptIn = NULL; info->flagIn = 0;
1616 info->fptOut = stdout; info->flagOut = 0;
1717 info->fptconfigFile = NULL; info->flagconfigFile = 0;
18- info->mode = 0; info->flagmode = 0;
18+ info->mode = 1; info->flagmode = 0;
1919 info->Contour = NULL; info->flagContour = 0;
2020 }
2121
--- a/src/Tools/mrcImage/mrcImageShapePCA/src/mrcImageShapePCA.c
+++ b/src/Tools/mrcImage/mrcImageShapePCA/src/mrcImageShapePCA.c
@@ -64,7 +64,11 @@ additionalUsage()
6464 fprintf(stderr, " 100%% 60%% 40%%\n");
6565 fprintf(stderr, "----- Objectives -----\n");
6666 fprintf(stderr, "Determine the orientations/molecular axis by PCA alogrism\n");
67- fprintf(stderr, " $ mrcImagePCA -i mrc -o parameter -C C1 C2 C3 ...\n");
67+ fprintf(stderr, " $ mrcImageShapePCA -i mrc -o parameter -C C1 C2 C3 ...\n");
68+ fprintf(stderr, "-m \n");
69+ fprintf(stderr, " +1: Sphere (default)\n");
70+ fprintf(stderr, " +2: Disk\n");
71+ fprintf(stderr, " +4: Cylinder\n");
6872 fprintf(stderr, "\n");
6973
7074 }
--- a/src/Tools/mrcImage/mrcImageShapePCA/src/mrcImageShapePCA.html
+++ b/src/Tools/mrcImage/mrcImageShapePCA/src/mrcImageShapePCA.html
@@ -11,7 +11,7 @@ Options:
1111 [-i[nput] In (NULL ).as(inFile::mrcImage ) ] :Essential :Input: mrcImage
1212 [-o[utput] Out (stdout ).as(outFile::ASCII ) ] :Optional :Output: ASCII
1313 [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile
14- [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode
14+ [-m[ode] mode (1 ).as(Integer ) ] :Optional :Mode
1515 [-C[ontour] Contour (1.0 ).as(Real ) ... ] :Variable :Contour
1616 ----- Additional Usage -----
1717 -C : ContourLevels
@@ -19,7 +19,11 @@ Options:
1919 100% 60% 40%
2020 ----- Objectives -----
2121 Determine the orientations/molecular axis by PCA alogrism
22- $ mrcImagePCA -i mrc -o parameter -C C1 C2 C3 ...
22+ $ mrcImageShapePCA -i mrc -o parameter -C C1 C2 C3 ...
23+-m
24+ +1: Sphere (default)
25+ +2: Disk
26+ +4: Cylinder
2327
2428 </PRE>
2529 </BODY>
--- a/src/Tools/mrcImage/mrcImageShapePCA/src/mrcImageShapePCA.pane
+++ b/src/Tools/mrcImage/mrcImageShapePCA/src/mrcImageShapePCA.pane
@@ -10,7 +10,7 @@
1010 -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'Input: mrcImage' i
1111 -O 1 0 1 0 0 1 -1x1+1+3.000000 ' ' 'Out' 'Output: ASCII' o
1212 -I 1 0 1 0 0 1 -1x1+1+4.500000 ' ' 'configFile' 'ConfigurationFile' c
13- -i 1 0 1 0 0 -1x1+1+6.000000 0 0 0 0 0 'mode' 'Mode' m
13+ -i 1 0 1 0 0 -1x1+1+6.000000 0 0 1 0 0 'mode' 'Mode' m
1414 -f 1 0 1 0 0 -1x1+1+7.500000 0 0 1.000000 0 0 0 'Contour' 'Contour' C
1515 -E
1616 -E
--- a/src/Tools/mrcImage/mrcImageShapePCA/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcImageShapePCA/src/test/Makefile
@@ -11,13 +11,13 @@ help:
1111
1212 exec: exec2
1313 @echo "----- Execution Check -----"
14- ../$(OSTYPE)/$(OBJECTNAME) -i data/121p-move.mrc -o data/121p-move.mrc.PCA -C 23696.7
14+ ../$(OSTYPE)/$(OBJECTNAME) -i data/121p-move.mrc -o data/121p-move.mrc.PCA -C 23696.7 -m 7
1515 pdbPCA -i data/121p-move.pdb -o data/121p-move.pdb.PCA
1616 @echo "----- Calc check -----"
1717
1818 exec2:
1919 @echo "----- Execution Check -----"
20- ../$(OSTYPE)/$(OBJECTNAME) -i data/myosinSwissModRefine2.mrc -o data/myosinSwissModRefine2.mrc.PCA -C 3.11319
20+ ../$(OSTYPE)/$(OBJECTNAME) -i data/myosinSwissModRefine2.mrc -o data/myosinSwissModRefine2.mrc.PCA -C 3.11319 -m 7
2121 pdbPCA -i data/myosinSwissModRefine2.pdb -o data/myosinSwissModRefine2.pdb.PCA
2222 @echo "----- Calc check -----"
2323
--- a/src/Tools/mrcImage/mrcImageShapePCA/src/usage.c
+++ b/src/Tools/mrcImage/mrcImageShapePCA/src/usage.c
@@ -10,7 +10,7 @@ usage(char* thisProgram)
1010 fprintf(stderr, " [-i[nput] In (NULL ).as(inFile::mrcImage ) ] :Essential :Input: mrcImage\n");
1111 fprintf(stderr, " [-o[utput] Out (stdout ).as(outFile::ASCII ) ] :Optional :Output: ASCII\n");
1212 fprintf(stderr, " [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile\n");
13- fprintf(stderr, " [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode\n");
13+ fprintf(stderr, " [-m[ode] mode (1 ).as(Integer ) ] :Optional :Mode\n");
1414 fprintf(stderr, " [-C[ontour] Contour (1.0 ).as(Real ) ... ] :Variable :Contour\n");
1515 additionalUsage();
1616 }