Changeset 33913

Timestamp:

May 25, 2012, 11:01:07 AM (14 years ago)

Author:

bills

Message:

Put the stack_id into the psphotStack output cmf file names instead of an integer

Location:

trunk

Files:

• ippScripts/scripts/staticsky.pl (modified) (2 diffs)
• psModules/src/camera/pmFPAfile.c (modified) (1 diff)
• psModules/src/camera/pmFPAfile.h (modified) (1 diff)
• psphot/src/psphotStackParseCamera.c (modified) (5 diffs)

trunk/ippScripts/scripts/staticsky.pl

@@ -144 +144 @@
             my $path_base = $file->{path_base};
             print "input: $path_base\n";
+            my $stack_id = $file->{stack_id};
 
             my $imageCnv  = $ipprc->filename("PPSTACK.OUTPUT",          $path_base ); # Image name
@@ -172 +173 @@
             &my_die("Couldn't find input: $sources",   $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$sources");
 
+            print $listFile "  STACK_ID      S64  " . $stack_id  . "\n";
             print $listFile "  RAW:IMAGE     STR  " . $imageRaw  . "\n";
             print $listFile "  RAW:MASK      STR  " . $maskRaw   . "\n";

trunk/psModules/src/camera/pmFPAfile.c

@@ -382 +382 @@
         // Number of the file in list
         psString num = NULL;            // Number to use
-        psStringAppend(&num, "%03d", file->fileID);
+        psStringAppend(&num, "%" PRId64, file->fileID);
         psStringSubstitute(&newRule, num, "{FILE.ID}");
         psFree(num);

trunk/psModules/src/camera/pmFPAfile.h

@@ -114 +114 @@
 
     int fileIndex;                      // Index of file
-    int fileID;                         // internal sequence number
+    psS64 fileID;                       // internal sequence number
 
     psS64 imageId, sourceId;            // Image and source identifiers

trunk/psphot/src/psphotStackParseCamera.c

@@ -129 +129 @@
         }
 
+        psS64 stack_id = psMetadataLookupS64(&status, input, "STACK_ID");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to find STACK_ID from sources %d", i);
+            return false;
+        }
         // generate an pmFPAimage for the output convolved image
         // XXX output of these files should be optional
@@ -139 +144 @@
             }
             outputImage->save = true;
-            outputImage->fileID = i;            // this is used to generate output names
+            outputImage->fileID = stack_id;             // this is used to generate output names
 
             pmFPAfile *outputMask = pmFPAfileDefineOutput(config, outputImage->fpa, "PSPHOT.STACK.OUTPUT.MASK");
@@ -151 +156 @@
             }
             outputMask->save = true;
-            outputMask->fileID = i;             // this is used to generate output names
+            outputMask->fileID = stack_id;              // this is used to generate output names
 
             pmFPAfile *outputVariance = pmFPAfileDefineOutput(config, outputImage->fpa, "PSPHOT.STACK.OUTPUT.VARIANCE");
@@ -163 +168 @@
             }
             outputVariance->save = true;
-            outputVariance->fileID = i;         // this is used to generate output names
+            outputVariance->fileID = stack_id;          // this is used to generate output names
 
             // the output sources are carried on the outputImage->fpa structures
@@ -172 +177 @@
             }
             outsources->save = true;
-            outsources->fileID = i;             // this is used to generate output names
+            outsources->fileID = stack_id;              // this is used to generate output names
         }
     }