Changeset 25913

Timestamp:

Oct 21, 2009, 3:26:31 PM (17 years ago)

Author:

eugene

Message:

adding feature to control if analysis generates a correction image or not

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/flatcorr.md (modified) (1 diff)
• ippTools/share/flatcorr_camerarundone.sql (modified) (1 diff)
• ippTools/share/flatcorr_chiprundone.sql (modified) (1 diff)
• ippTools/share/flatcorr_pendingprocess.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff)
• ippTools/src/flatcorr.c (modified) (4 diffs)
• ippTools/src/flatcorrConfig.c (modified) (3 diffs)

trunk/dbconfig/changes.txt

@@ -1329 +1329 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+ALTER TABLE flatcorrRun ADD COLUMN make_corr tinyint after state;
 
 ALTER TABLE chipRun ADD COLUMN data_group VARCHAR(64) AFTER label;

trunk/dbconfig/flatcorr.md

@@ -10 +10 @@
     filter      STR         64
     state       STR         64
+    make_corr   BOOL        t
     workdir     STR         255 
     label       STR         64

trunk/ippTools/share/flatcorr_camerarundone.sql

@@ -7 +7 @@
 JOIN camRun
     USING(cam_id)
-LEFT JOIN addRun
-    ON camRun.cam_id = addRun.cam_id
+LEFT JOIN flatcorrAddstarLink
+    using(corr_id, cam_id)
 WHERE
     flatcorrRun.state = 'new'
     AND flatcorrCamLink.include = 1
     AND camRun.state = 'full'
-    AND addRun.cam_id is NULL
+    AND flatcorrAddstarLink.corr_id is NULL

trunk/ippTools/share/flatcorr_chiprundone.sql

@@ -7 +7 @@
 JOIN chipRun
     USING(chip_id)
-LEFT JOIN camRun
-    ON chipRun.chip_id = camRun.chip_id
+LEFT JOIN flatcorrCamLink
+    using(corr_id, chip_id)
 WHERE
     flatcorrRun.state = 'new'
     AND flatcorrChipLink.include = 1
     AND chipRun.state = 'full'
-    AND camRun.cam_id is NULL
+    AND flatcorrCamLink.corr_id is NULL

trunk/ippTools/share/flatcorr_pendingprocess.sql

@@ -6 +6 @@
   filter,
   state,
+  make_corr,
   workdir,
   label,

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1217 +1217 @@
         filter VARCHAR(64),
         state VARCHAR(64),
+        make_corr TINYINT,
         workdir VARCHAR(255),
         label VARCHAR(64),

trunk/ippTools/src/flatcorr.c

@@ -133 +133 @@
     PXOPT_LOOKUP_STR(tess_id, config->args, "-set_tess_id", false, false);
     PXOPT_LOOKUP_STR(region, config->args, "-set_region", false, false);
+    PXOPT_LOOKUP_BOOL(make_correction, config->args, "-make_correction", false);
     PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false);
 
@@ -203 +204 @@
             filter,
             "reg",  // state
+            make_correction,
             workdir,
             label,
@@ -294 +296 @@
     PXOPT_LOOKUP_STR(tess_id, config->args, "-set_tess_id", false, false);
     PXOPT_LOOKUP_STR(region, config->args, "-set_region", false, false);
+    PXOPT_LOOKUP_BOOL(make_correction, config->args, "-make_correction", false);
     // XXX probably should make the region in -set_region match ra_min, ra_max, etc
 
@@ -315 +318 @@
         filter,
         "reg",  // state
+        make_correction,
         workdir,
         label,

trunk/ippTools/src/flatcorrConfig.c

@@ -59 +59 @@
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_tess_id",  0,            "define tessalation", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_region",   0,            "define region", NULL);
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-make_correction",  0,       "generate a correction image and add to detrend database", false);
 
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",  0,            "print the exposures that would be included in the detrend run and exit", false);
@@ -76 +77 @@
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-set_tess_id",  0,            "define tessalation", NULL);
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-set_region",  0,            "define region", NULL);
+    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-make_correction",  0,       "generate a correction image and add to detrend database", false);
     psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
 
@@ -129 +131 @@
     psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-corr_id", 0, "define correction id (required)", 0);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state",   0, "set state (required)", NULL);
+    // XXX add mechanism to change this value: psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-set_correction",  0, "generate a correction image and add to detrend database", false);
 
     // -inputexp