Changeset 33023

Timestamp:

Dec 24, 2011, 3:28:40 PM (15 years ago)

Author:

heather

Message:

smore changes: handles -uncensored properly (well for queuing, it queues
things regardless of magicked state, as we copy a backup of the uncensored
files), and some debugging to get minidvodb's relphot'd and resorted properly
(some typos)

Location:

branches/haf_add201112

Files:

• ippScripts/scripts/addstar_run.pl (modified) (2 diffs)
• ippScripts/scripts/minidvodb_premerge.pl (modified) (4 diffs)
• ippTools/src/addtool.c (modified) (1 diff)

branches/haf_add201112/ippScripts/scripts/addstar_run.pl

@@ -115 +115 @@
 # it was PSASTRO.OUTPUT
 
-my $fpaObjects;
+my $fpaObjects = $ipprc->filename("PSASTRO.OUTPUT", $stageroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
+
 if ($stage =~ /cam/) {
     # if it is cam stage we need to be careful when grabbing the filename. 
@@ -150 +151 @@
         #is this cam_id magicked or not?
         if ($magicked) {
-            $fpaObjects = $ipprc->destreak_filename("PSASTRO.OUTPUT",     $stageroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
+            $fpaObjects = $ipprc->destreaked_filename("$fpaObjects") or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
             print "cam_id is magicked, using $fpaObjects for the cam smf\n";
         } else {
-            
-            $fpaObjects = $ipprc->filename("PSASTRO.OUTPUT",     $stageroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
             print "cam_id is NOT magicked, using $fpaObjects for the cam smf\n";
         }
     }
-} else {
-    # for non cam stages, grabe the file name like this:
-    $fpaObjects = $ipprc->filename("PSASTRO.OUTPUT",     $stageroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
 }
 if (($stage =~/staticsky/) || ($stage =~/stack/)) {

branches/haf_add201112/ippScripts/scripts/minidvodb_premerge.pl

@@ -79 +79 @@
 
 unless ($no_op) {
-    {
+    
         #this is chopped into several parts: addstar, relphot
         #addstar
-        {
+        {
             my $command  = "$addstar -resort";
             $command .= " -D CAMERA $camera";
@@ -110 +110 @@
             print "$command\n";
             my $mjd_relphot_start = DateTime->now->mjd;   # MJD of starting script
-
+            
             my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
                 run(command => $command, verbose => $verbose);
@@ -122 +122 @@
 
         {
-
+            
             $dtime_script = 86400.0*(DateTime->now->mjd - $mjd_start);
             my $command = "addtool -minidvodb_id $minidvodb_id";
@@ -139 +139 @@
             }
         }
-    } else {
-        &my_die("dvodb: minidvodb_id = $minidvodb_id not found", $minidvodb_id, $PS_EXIT_UNKNOWN_ERROR);
-    }
+#} else {
+#    &my_die("dvodb: minidvodb_id = $minidvodb_id not found", $minidvodb_id, $PS_EXIT_UNKNOWN_ERROR);
+#}
 } else {
     print "skipping processing for minidvodb_id = $minidvodb_id\n";

branches/haf_add201112/ippTools/src/addtool.c

@@ -292 +292 @@
     } else {
       //This picks only the unmagicked/uncensored ones
-      if (strcmp(stage,"cam") == 0) {
-        psStringAppend(&query, " AND (camRun.magicked = 0)");
-      }
+      //if (strcmp(stage,"cam") == 0) {
+        //we can now properly handle the magicked case in ippScripts, so we queue camRuns in any magic state now if -uncensored.
+        //psStringAppend(&query, " AND (camRun.magicked = 0)");
+        //}
       if (strcmp(stage,"stack") == 0) {
         psStringAppend(&query, " AND (stackRun.magicked = 0)");