Changeset 31297

Timestamp:

Apr 15, 2011, 12:17:51 PM (15 years ago)

Author:

heather

Message:

small modifications (with testing) to get staticsky stage working in add*

Location:

branches/haf_branches/haf_add2011

Files:

• ippScripts/scripts/addstar_run.pl (modified) (3 diffs)
• ippTasks/addstar.pro (modified) (2 diffs)
• ippTasks/survey.pro (modified) (2 diffs)

branches/haf_branches/haf_add2011/ippScripts/scripts/addstar_run.pl

@@ -95 +95 @@
   $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR_STACK'); # Recipe to use
 }
-if ($stage =~/staticsky/) {
-  $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR_STATICSKY'); # Recipe to use
-}
+#if ($stage =~/staticsky/) {
+#  $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR_STATICSKY'); # Recipe to use
+#}
 &my_die("Unrecognised ADDSTAR recipe", $add_id, $PS_EXIT_CONFIG_ERROR) unless defined $recipe_addstar;
 
@@ -106 +106 @@
 
 # the camera configurations should define the psastro output to be a single file (MEF), regardless of the inputs
+
+# it was PSASTRO.OUTPUT
 my $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/)) {
+    $fpaObjects =~ s/smf$/cmf/;
+    
+}
 my $traceDest  = $ipprc->filename("TRACE.EXP",          $outroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
 
@@ -182 +189 @@
         $command .= " $realFile";
         $command .= " -use-name $fpaObjects"; # DVO wants the neb-name as a file reference
-        $command .= " -image" if $image_only;
-
+            $command .= " -image" if $image_only;
+            if ($stage = ~/staticsky/) {
+                $command .= " -accept-astrom ";
+            }
         my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script
 

branches/haf_branches/haf_add2011/ippTasks/addstar.pro

@@ -252 +252 @@
     book getword addPendingExp $pageName exp_tag -var EXP_TAG
     book getword addPendingExp $pageName add_id -var ADD_ID
-    book getword addPendingExp $pageName camroot -var CAMROOT
+    book getword addPendingExp $pageName stageroot -var STAGEROOT
+    book getword addPendingExp $pageName stage -var STAGE  
     book getword addPendingExp $pageName workdir -var WORKDIR_TEMPLATE
     book getword addPendingExp $pageName reduction -var REDUCTION
@@ -277 +278 @@
 
     ## generate outroot specific to this exposure (& chip)
-    sprintf outroot "%s/%s/%s.add.%s" $WORKDIR $EXP_TAG $EXP_TAG $ADD_ID
+
+    if ("$STAGE" == "cam")
+        sprintf outroot "%s/%s/%s.add.%s" $WORKDIR $EXP_TAG $EXP_TAG $ADD_ID
+    end
+    if ("$STAGE" == "staticsky")
+        sprintf outroot "%s.add.%s" $STAGEROOT $ADD_ID
+    end
+    if ("$STAGE" == "stack")
+        sprintf outroot "%s.add.%s" $STAGEROOT $ADD_ID
+    end
+  
 
     stdout $LOGDIR/addstar.exp.log
     stderr $LOGDIR/addstar.exp.log
 
-    $run = addstar_run.pl --exp_tag $EXP_TAG --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output
+    $run = addstar_run.pl --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output
     if ("$REDUCTION" != "NULL")
       $run = $run --reduction $REDUCTION

branches/haf_branches/haf_add2011/ippTasks/survey.pro

@@ -231 +231 @@
 
 macro survey.add.addstar
-  if ($0 != 4)
+  if ($0 != 5)
     echo "USAGE: survey.add.addstar (label) (dvodb) (minidvodb_group) (stage)"
     break
@@ -238 +238 @@
   book setword SURVEY_ADDSTAR $1 DVODB $2
   book setword SURVEY_ADDSTAR $1 MINIDVODB_GROUP $3
-  book setwork SURVEY_ADDSTAR $1 STAGE $4  
+  book setword SURVEY_ADDSTAR $1 STAGE $4  
   book setword SURVEY_ADDSTAR $1 STATE PENDING
 end