Changeset 34731

Timestamp:

Nov 29, 2012, 1:43:13 PM (13 years ago)

Author:

watersc1

Message:

updates for background restoration

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/stack.md (modified) (1 diff)
• dbconfig/warp.md (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (2 diffs)
• ippTools/src/stacktool.c (modified) (3 diffs)
• ippTools/src/stacktoolConfig.c (modified) (2 diffs)
• ippTools/src/warptool.c (modified) (3 diffs)
• ippTools/src/warptoolConfig.c (modified) (2 diffs)

trunk/dbconfig/changes.txt

@@ -2255 +2255 @@
 --update addRun set stage_extra1 = -1 where stage = 'cam' <= 483624; 
 
+ALTER TABLE warpSkyfile add column background_model SMALLINT after maskfrac_advisory;
+ALTER TABLE stackSumSkyfile add column background_model SMALLINT after software_ver;
+UPDATE dbversion set schema_version = '1.1.72', updated= CURRENT_TIMESTAMP();

trunk/dbconfig/stack.md

@@ -53 +53 @@
     fault              S16    0       # Key
     software_ver    STR         16
+    background_model   S16    0
     quality            S16    0
 END

trunk/dbconfig/warp.md

@@ -74 +74 @@
     maskfrac_magic  F32     0.0
     maskfrac_advisory F32   0.0
+    background_model  S16   0
 END
 

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -996 +996 @@
     maskfrac_magic FLOAT,
     maskfrac_advisory FLOAT,
+    background_model SMALLINT,
     PRIMARY KEY(warp_id, skycell_id, tess_id),
     KEY(good_frac),
@@ -1078 +1079 @@
         good_frac FLOAT,
         mjd_obs DOUBLE,
-        quality SMALLINT NOT NULL DEFAULT 0,
         fault SMALLINT,
         software_ver VARCHAR(16),
+        background_model SMALLINT,
+        quality SMALLINT NOT NULL DEFAULT 0,
         PRIMARY KEY(stack_id),
         KEY(dtime_stack),

trunk/ippTools/src/stacktool.c

@@ -1006 +1006 @@
     PXOPT_LOOKUP_STR(ver_streaks, config->args, "-ver_streaks", false, false);
 
+    PXOPT_LOOKUP_S16(background_model, config->args, "-background_model", false, false);
+    
     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s ppstack %s streaks %s\n",
             ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_ppstack,ver_streaks);
@@ -1067 +1069 @@
                                fault,
                                software_ver,
+                               background_model,
                                quality
           )) {
@@ -1121 +1124 @@
     PXOPT_COPY_F64(config->args, where, "-mjd_obs_begin", "stackSumSkyfile.mjd_obs", ">=");
     PXOPT_COPY_F64(config->args, where, "-mjd_obs_end", "stackSumSkyfile.mjd_obs", "<=");
-
+    PXOPT_COPY_S16(config->args, where, "-background_model","stackSumSkyfile.background_model", "==");
 
 //  The following three selectors are incompatible with the sql so omit them

trunk/ippTools/src/stacktoolConfig.c

@@ -190 +190 @@
     psMetadataAddStr(addsumskyfileArgs, PS_LIST_TAIL, "-ver_streaks", 0, "define streaksremove version", NULL);
 
+    psMetadataAddS16(addsumskyfileArgs, PS_LIST_TAIL, "-background_model", 0, "define background model version", 0);
+    
     // -sumskyfile
     psMetadata *sumskyfileArgs= psMetadataAlloc();
@@ -201 +203 @@
     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-exp_name", 0,          "search by exposure name", NULL);
 #endif
+    psMetadataAddS16(sumskyfileArgs, PS_LIST_TAIL, "-background_model", 0, "search by background model version", 0);
     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK,             "search by stackRun.label", NULL);
     psMetadataAddStr(sumskyfileArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK,        "search by stackRun.data_group (LIKE comparison)", NULL);

trunk/ippTools/src/warptool.c

@@ -1101 +1101 @@
     PXOPT_LOOKUP_F32(maskfrac_advisory, config->args, "-maskfrac_advisory", false, false);
 
+    PXOPT_LOOKUP_S16(background_model, config->args, "-background_model", false, false);
+    
     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s pswarp %s streaks %s\n",
             ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_pswarp,ver_streaks);
@@ -1159 +1161 @@
                            maskfrac_dynamic,
                            maskfrac_magic,
-                           maskfrac_advisory
+                           maskfrac_advisory,
+                           background_model
         )) {
         if (!psDBRollback(config->dbh)) {
@@ -1392 +1395 @@
     PXOPT_COPY_STR(config->args, where, "-filter",    "rawExp.filter", "LIKE");
     PXOPT_COPY_S64(config->args, where, "-magicked", "warpSkyfile.magicked", "==");
+    PXOPT_COPY_S16(config->args, where, "-background_model", "warpSkyfile.background_model", "==");
     pxAddLabelSearchArgs (config, where, "-label",   "warpRun.label", "LIKE");
     pxAddLabelSearchArgs (config, where, "-data_group",   "warpRun.data_group", "LIKE");

trunk/ippTools/src/warptoolConfig.c

@@ -237 +237 @@
     psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-maskfrac_advisory", 0, "define advisory mask fraction", NAN);
 
+    psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-background_model", 0, "define background model version", 0);
     
     // -warped
@@ -254 +255 @@
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-data_group",  PS_META_DUPLICATE_OK, "search by warpRun data_group", NULL);
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-dist_group",  PS_META_DUPLICATE_OK, "search by warpRun dist_group", NULL);
+    psMetadataAddS16(warpedArgs, PS_LIST_TAIL,  "-background_model", 0, "search by background model version", 0);
     // add magic related arguments
     pxmagicAddArguments(warpedArgs);