Changeset 9123

Timestamp:

Oct 2, 2006, 4:44:19 PM (20 years ago)

Author:

jhoblitt

Message:

rename addnormstat -> addnormalizedstat
rename tonormstat -> tonormalizedstat

Location:

trunk

Files:

• doc/ipptools/dettool.txt (modified) (3 diffs)
• ippTools/src/dettool.c (modified) (5 diffs)
• ippTools/src/dettool.h (modified) (1 diff)
• ippTools/src/dettoolConfig.c (modified) (1 diff)

trunk/doc/ipptools/dettool.txt

@@ -140 +140 @@
 Pan-Tasks regularly runs:
 
-        dettool -tonormstat
+        dettool -tonormalizedstat
 
 This returns a list of detrend id and iteration for which the entire
@@ -165 +165 @@
 into the database:
 
-        dettool -addnormstat -det_id <det_id> -iter <iter> -class_id <class_id> -norm <normalisation> 
+        dettool -addnormalizedstat -det_id <det_id> -iter <iter> -class_id <class_id> -norm <normalisation> 
 
 In practise, the above three commands ("dettool -processedimfile",
-"ppNormCalc" and "dettool -addnormstat") will be performed by a Perl
+"ppNormCalc" and "dettool -addnormalizedstat") will be performed by a Perl
 script, "detrend_norm_calc.pl".
 
@@ -175 +175 @@
 matrix with ppNormCalc.
 
-*** To do: possible upgrade path is to have "dettool -addnormstat"
+*** To do: possible upgrade path is to have "dettool -addnormalizedstat"
            parse a metadata config file from ppNorm to get the
            multiple normalisations, instead of running it several

trunk/ippTools/src/dettool.c

@@ -30 +30 @@
 static bool stacframeMode(pxConfig *config); // needed?
 static bool tonormalizeMode(pxConfig *config);
-static bool addnormstatMode(pxConfig *config);
-static bool tonormstatMode(pxConfig *config);
+static bool addnormalizedstatMode(pxConfig *config);
+static bool tonormalizedstatMode(pxConfig *config);
 static bool addnormalizedimfileMode(pxConfig *config);
 static bool tonormalizedexpMode(pxConfig *config);
@@ -98 +98 @@
         MODECASE(DETTOOL_MODE_STACKEDFRAME,     stacframeMode); // needed?
         MODECASE(DETTOOL_MODE_TONORMALIZE,      tonormalizeMode);
-        MODECASE(DETTOOL_MODE_ADDNORMSTAT,      addnormstatMode);
-        MODECASE(DETTOOL_MODE_TONORMSTAT,       tonormstatMode);
+        MODECASE(DETTOOL_MODE_ADDNORMALIZEDSTAT,addnormalizedstatMode);
+        MODECASE(DETTOOL_MODE_TONORMALIZEDSTAT, tonormalizedstatMode);
         MODECASE(DETTOOL_MODE_ADDNORMALIZEDIMFILE,addnormalizedimfileMode);
         MODECASE(DETTOOL_MODE_NORMALIZEDIMFILE, normalizedimfileMode);
@@ -2103 +2103 @@
 }
 
-static bool tonormalizeMode(pxConfig *config)
+static bool tonormalizedstatMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -2183 +2183 @@
 }
 
-static bool addnormstatMode(pxConfig *config)
+static bool addnormalizedstatMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, NULL);
@@ -2290 +2290 @@
 }
 
-static bool tonormstatMode(pxConfig *config)
+static bool tonormalizeMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);

trunk/ippTools/src/dettool.h

@@ -25 +25 @@
     DETTOOL_MODE_STACKEDFRAME,
     DETTOOL_MODE_TONORMALIZE,
-    DETTOOL_MODE_ADDNORMSTAT,
-    DETTOOL_MODE_TONORMSTAT,
+    DETTOOL_MODE_ADDNORMALIZEDSTAT,
+    DETTOOL_MODE_TONORMALIZEDSTAT,
     DETTOOL_MODE_ADDNORMALIZEDIMFILE,
     DETTOOL_MODE_NORMALIZEDIMFILE,

trunk/ippTools/src/dettoolConfig.c

@@ -550 +550 @@
     PXTOOL_MODE("-addstacked",      DETTOOL_MODE_ADDSTACKED,    addstacArgs);
     PXTOOL_MODE("-tonormalize",     DETTOOL_MODE_TONORMALIZE,   tonormalizeArgs);
-    PXTOOL_MODE("-addnormstat",     DETTOOL_MODE_ADDNORMSTAT,   addnormstatArgs);
-    PXTOOL_MODE("-tonormstat",      DETTOOL_MODE_TONORMSTAT,    tonormstatArgs);
+    PXTOOL_MODE("-addnormalizedstat",     DETTOOL_MODE_ADDNORMALIZEDSTAT,   addnormstatArgs);
+    PXTOOL_MODE("-tonormalizedstat",      DETTOOL_MODE_TONORMALIZEDSTAT,    tonormstatArgs);
     PXTOOL_MODE("-stacked",         DETTOOL_MODE_STACKED,       stacArgs);
 //    PXTOOL_MODE("-stackedframe",    DETTOOL_MODE_STACKEDFRAME,  stacframeArgs);