Changeset 37830 for branches/eam_branches/ipp-pv3-20140717-merge/ippScripts/scripts/addstar_run.pl

Timestamp:

Jan 12, 2015, 12:37:37 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-pv3-20140717-merge/ippScripts/scripts

Files:

• . (modified) (1 prop)
• addstar_run.pl (modified) (4 diffs)

branches/eam_branches/ipp-pv3-20140717-merge/ippScripts/scripts/addstar_run.pl

@@ -94 +94 @@
 # Recipes to use based on reduction class
 $reduction = 'DEFAULT' unless defined $reduction;
-if ($stage =~/skycal/) {
-    $reduction = 'DEFAULT';
-}
+#if ($stage =~/diff/) {
+#    $reduction = 'ADDSTAR';
+#} 
+#if ($stage =~/fullforce/) {
+#    $reduction = 'ADDSTAR';
+#} 
+
+if ($stage =~/fullforce/) {
+    $reduction='DEFAULT';
+    #hardwired because why not
+}
+
 my $recipe_addstar = $ipprc->reduction($reduction, 'ADDSTAR');
 # XXX This is now not used: do we still need it?
@@ -132 +141 @@
     print "using $fpaObjects for $stage\n";
 }
+if ($stage =~/diff/) {
+    print "using $fpaObjects for $stage\n";
+}
+if ($stage =~/fullforce/)  {
+    print "using $fpaObjects for $stage\n";
+} 
+
 
 
@@ -177 +193 @@
 }
 
-if (($stage =~/stack/ || $stage =~ /skycal/)) {
+if (($stage =~/stack/ || $stage =~ /skycal/ || $stage =~/diff/ || $stage=~/fullforce/)) {
     $fpaObjects =~ s/smf$/cmf/;
     $fpaObjectsAlt =~ s/smf$/cmf/;
@@ -305 +321 @@
                 $command .= " -quick-airmass";
             }  #careful here - this matches staticsky and staticsky_multi
+            if ($stage =~ /diff/) {
+                $command .= " -accept-astrom";
+            }
+            if ($stage =~ /fullforce/) {
+                $command .= " -accept-astrom -xrad"; 
+            }
 
             my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script