Changeset 42388

Timestamp:

Feb 8, 2023, 12:15:30 PM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. option to skip astrometry and only generate jpegs; generate the jpegs even if the FWHM > maxFWHM

Location:

trunk/ippScripts

Files:

• Build.PL (modified) (1 diff)
• scripts/camera_exp.pl (modified) (4 diffs)
• scripts/fpcamera_exp.pl (copied) (copied from branches/eam_branches/ipp-20220316/ippScripts/scripts/fpcamera_exp.pl )
• scripts/rawcheck.pl (modified) (1 prop)
• scripts/warp_overlap.pl (modified) (1 prop)

trunk/ippScripts/Build.PL

@@ -155 +155 @@
         scripts/sc_transfer_tool.pl
         scripts/remote_md5sum.pl
+        scripts/fpcamera_exp.pl
     )],
     dist_abstract => 'Scripts for running the Pan-STARRS IPP',

trunk/ippScripts/scripts/camera_exp.pl

@@ -133 +133 @@
 }
 
+## option to skip the astrometry analysis (but still do the jpegs)
+## if not defined in the config file, default is to not skip
+my $skip_astrom = 0;
+$skip_astrom = metadataLookupBool($recipeData, 'PSASTRO.SKIP.ASTROMETRY');
+print "skip astrom: $skip_astrom\n"; 
+if ($skip_astrom) { print "skip the astrom\n"; }
+
 my $cmdflags;
 
@@ -183 +190 @@
         ($expFWHM) = $cmdflags =~ /-fwhm_major (\d+)/;  
         
-        if ($expFWHM > $maxFWHM) {
+        if (not defined $expFWHM) {
+            print "FWHM not measured (no photometry?), Setting quality to 4077\n";
+            $cmdflags .= " -quality 4077 "; # This corresponds to PSASTRO_ERR_DATA
+            $skip_astrom = 1;
+        } elsif ($expFWHM > $maxFWHM) {
             print "Setting quality to 4007 due to large FWHM: exposure: $expFWHM  maximum: $maxFWHM\n";
             $cmdflags .= " -quality 4007 "; # This corresponds to PSASTRO_ERR_DATA
-            $no_op = 1;
-        }
-    }
-}
-
+            # $no_op = 1;
+            $skip_astrom = 1; # skip astrometry, but make the jpegs
+        }
+    }
+}
 
 my $do_masks;               # Produce masks?
@@ -297 +308 @@
 my $jpeg1      = prepare_output("PPIMAGE.JPEG1",      $outroot, undef, 1) if $do_jpegs;
 my $jpeg2      = prepare_output("PPIMAGE.JPEG2",      $outroot, undef, 1) if $do_jpegs;
-my $fpaObjects = prepare_output("PSASTRO.OUTPUT",     $outroot, undef, 1) if !$bkg_only;
+my $fpaObjects = prepare_output("PSASTRO.OUTPUT",     $outroot, undef, 1) if (!$bkg_only && !$skip_astrom);
 
 my $configuration;
@@ -342 +353 @@
     }
 
-    if (!$bkg_only) {
+    if (!$bkg_only && !$skip_astrom) {
         # run psastro on the chipObjects, producing fpaObjects
         my $command;