Changeset 39016 for trunk

Timestamp:

Oct 30, 2015, 5:20:30 PM (11 years ago)

Author:

watersc1

Message:

Actually populate DiffDetection table, after noting that imageID in mkcmf is the diff_skyfile_id. Fix incorrect column uniqueness.

Location:

trunk/ippToPsps

Files:

• jython/diffbatch.py (modified) (1 diff)
• test/mkgpc1data.dvo (modified) (2 diffs)

trunk/ippToPsps/jython/diffbatch.py

@@ -533 +533 @@
         self.logger.debug("Altering PSPS tables")
         self.logger.debug("Creating indexes on PSPS tables")
-        self.scratchDb.makeColumnUnique("DiffDetection", "diffObjID")
+        self.scratchDb.makeColumnUnique("DiffDetection", "diffDetID")
         self.scratchDb.makeColumnPrimaryKey("DiffDetection", "ippDetectID")
 

trunk/ippToPsps/test/mkgpc1data.dvo

@@ -73 +73 @@
   $dbhost = localhost
   $dbname = gpc1test
-#  $dbuser = dvo
-#  $dbpass = dvo
-  $dbuser = czw
-  $dbpass = czw
+  $dbuser = dvo
+  $dbpass = dvo
+#  $dbuser = czw
+#  $dbpass = czw
 
   exec mkgpc1.sh delete $dbhost $dbname $dbuser $dbpass
@@ -558 +558 @@
 
     mkinput $offset $rawfile
-    echo mkcmf -diff -photcode SIMTEST.$filter.SkyChip -no-noise -extroot SkyChip -append $rawfile $cmffile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $ID -sourceID 36 -bad-psfqf-frac $BAD_PSFQF_FRAC
-    exec mkcmf -diff -photcode SIMTEST.$filter.SkyChip -no-noise -extroot SkyChip -append $rawfile $cmffile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $ID -sourceID 36 -bad-psfqf-frac $BAD_PSFQF_FRAC
+    $diff_skyfile_id = $ID + 25
+    echo mkcmf -diff -photcode SIMTEST.$filter.SkyChip -no-noise -extroot SkyChip -append $rawfile $cmffile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $diff_skyfile_id -sourceID 36 -bad-psfqf-frac $BAD_PSFQF_FRAC
+    exec mkcmf -diff -photcode SIMTEST.$filter.SkyChip -no-noise -extroot SkyChip -append $rawfile $cmffile -date $myDATE -time $myTIME -mjd $mjd -radec $RA $DEC -type $1 -imageID $diff_skyfile_id -sourceID 36 -bad-psfqf-frac $BAD_PSFQF_FRAC