Changeset 9766

Timestamp:

Oct 27, 2006, 2:59:09 PM (20 years ago)

Author:

jhoblitt

Message:

rename dettool -definebyexp -> definebytag

Location:

trunk/ippTools

Files:

• scripts/regtest.sh (modified) (2 diffs)
• src/dettool.c (modified) (3 diffs)
• src/dettool.h (modified) (1 diff)
• src/dettoolConfig.c (modified) (2 diffs)

trunk/ippTools/scripts/regtest.sh

@@ -24 +24 @@
 done;
 
-$p0tool -updateexp -exp_tag t10 -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 -object dog -dateobs "2006-10-20T10:10:10Z" -label foobarbaz $* || exit 1
+$p0tool -updateexp -exp_tag t10 -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 -object dog -dateobs "2006-10-20T10:10:10Z" -label foobar $* || exit 1
 
 for ID in `seq 0 3`; do
@@ -30 +30 @@
 done;
 
-$p0tool -updateexp -exp_tag t11 -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 -object dog -dateobs 2006-10-20T10:10:10Z -label foobarbaz $* || exit 1
+$p0tool -updateexp -exp_tag t11 -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 -object dog -dateobs 2006-10-20T10:10:10Z -label foobar $* || exit 1

trunk/ippTools/src/dettool.c

@@ -31 +31 @@
 
 static bool pendingMode(pxConfig *config);
-static bool definebyexpMode(pxConfig *config);
+static bool definebytagMode(pxConfig *config);
 static bool definebyqueryMode(pxConfig *config);
 static bool runsMode(pxConfig *config);
@@ -93 +93 @@
     switch (config->mode) {
         MODECASE(DETTOOL_MODE_PENDING,          pendingMode);
-        MODECASE(DETTOOL_MODE_DEFINEBYEXP,      definebyexpMode);
+        MODECASE(DETTOOL_MODE_DEFINEBYTAG,      definebytagMode);
         MODECASE(DETTOOL_MODE_DEFINEBYQUERY,    definebyqueryMode);
         MODECASE(DETTOOL_MODE_RUNS,             runsMode);
@@ -203 +203 @@
 }
 
-static bool definebyexpMode(pxConfig *config)
+static bool definebytagMode(pxConfig *config)
 {
     bool status     = false;

trunk/ippTools/src/dettool.h

@@ -26 +26 @@
     DETTOOL_MODE_NONE           = 0x0,
     DETTOOL_MODE_PENDING,
-    DETTOOL_MODE_DEFINEBYEXP,
+    DETTOOL_MODE_DEFINEBYTAG,
     DETTOOL_MODE_DEFINEBYQUERY,
     DETTOOL_MODE_RUNS,

trunk/ippTools/src/dettoolConfig.c

@@ -61 +61 @@
             "use the simple output format", false);
 
-    // -definebyexp 
-    psMetadata *definebyexpArgs = psMetadataAlloc();
-    psMetadataAddStr(definebyexpArgs, PS_LIST_TAIL, "-exp_tag",
+    // -definebytag 
+    psMetadata *definebytagArgs = psMetadataAlloc();
+    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-exp_tag",
             PS_META_DUPLICATE_OK,
             "include this exposure (multiple OK, required)", NULL);
-    psMetadataAddStr(definebyexpArgs, PS_LIST_TAIL, "-det_type",  0,
+    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-det_type",  0,
             "define the type of detrend run (required)", NULL);
-    psMetadataAddStr(definebyexpArgs, PS_LIST_TAIL, "-exp_type",  0,
+    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-exp_type",  0,
         "define exposure type", NULL);
-    psMetadataAddStr(definebyexpArgs, PS_LIST_TAIL, "-filter",  0,
+    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-filter",  0,
         "define filter ", NULL);
-    psMetadataAddF32(definebyexpArgs, PS_LIST_TAIL, "-airmass",  0,
+    psMetadataAddF32(definebytagArgs, PS_LIST_TAIL, "-airmass",  0,
         "define airmass", NAN);
-    psMetadataAddF32(definebyexpArgs, PS_LIST_TAIL, "-exp_time",  0,
+    psMetadataAddF32(definebytagArgs, PS_LIST_TAIL, "-exp_time",  0,
         "define exposure time", NAN);
-    psMetadataAddF64(definebyexpArgs, PS_LIST_TAIL, "-ccd_temp",  0,
+    psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-ccd_temp",  0,
         "define ccd tempature", NAN);
-    psMetadataAddF64(definebyexpArgs, PS_LIST_TAIL, "-posang",  0,
+    psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-posang",  0,
         "define rotator position angle", NAN);
-    psMetadataAddStr(definebyexpArgs, PS_LIST_TAIL, "-object",  0,
+    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-object",  0,
         "define exposure object", NULL);
-    psMetadataAddStr(definebyexpArgs, PS_LIST_TAIL, "-registered",  0,
+    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-registered",  0,
         "time detrend run was registered", now);
-    psMetadataAddStr(definebyexpArgs, PS_LIST_TAIL, "-use_begin",  0,
+    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-use_begin",  0,
         "start of detrend run applicable peroid", NULL);
-    psMetadataAddStr(definebyexpArgs, PS_LIST_TAIL, "-use_end",  0,
+    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-use_end",  0,
         "end of detrend run applicable peroid", NULL);
-    psMetadataAddBool(definebyexpArgs, PS_LIST_TAIL, "-simple",  0,
+    psMetadataAddBool(definebytagArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
    
@@ -542 +542 @@
     // find which mode we're running under
     PXTOOL_MODE("-pending",         DETTOOL_MODE_PENDING,       pendingArgs);
-    PXTOOL_MODE("-definebyexp",     DETTOOL_MODE_DEFINEBYEXP,   definebyexpArgs);
+    PXTOOL_MODE("-definebytag",     DETTOOL_MODE_DEFINEBYTAG,   definebytagArgs);
     PXTOOL_MODE("-definebyquery",DETTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs);
     PXTOOL_MODE("-raw",             DETTOOL_MODE_RAW,           rawArgs);