Index: trunk/pstamp/scripts/pstamp_finish.pl =================================================================== --- trunk/pstamp/scripts/pstamp_finish.pl (revision 25738) +++ trunk/pstamp/scripts/pstamp_finish.pl (revision 25739) @@ -297,5 +297,5 @@ if ($rownum eq 0) { - my $dummy_rowinfo = "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|"; + my $dummy_rowinfo = "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|"; return (undef, $dummy_rowinfo, "none"); } @@ -308,11 +308,16 @@ my $tess_id = $row->{TESS_ID}; $tess_id = "null" if !$tess_id; + my $comment = $row->{COMMENT}; + $comment = "null" if !$comment; + my $label = $row->{LABEL}; + $label = "null" if !$label; # This is ugly, error prone and hard to change. # Create a results file module and provide a list of the names (we have the data in the columns) my $rowinfo = "$row->{PROJECT}|$row->{JOB_TYPE}|$row->{REQ_TYPE}|$row->{IMG_TYPE}|"; - $rowinfo .= "$row->{ID}|$tess_id|$component|$row->{OPTION_MASK}|$row->{MJD_MIN}|$row->{MJD_MAX}|"; + $rowinfo .= "$row->{ID}|$tess_id|$component|$label|$row->{OPTION_MASK}|$row->{MJD_MIN}|$row->{MJD_MAX}|"; $rowinfo .= "$row->{REQFILT}|$row->{COORD_MASK}|$row->{CENTER_X}|$row->{CENTER_Y}|"; - $rowinfo .= "$row->{WIDTH}|$row->{HEIGHT}"; + $rowinfo .= "$row->{WIDTH}|$row->{HEIGHT}|"; + $rowinfo .= $comment; return ($row, $rowinfo, $row->{PROJECT}); Index: trunk/pstamp/scripts/pstamp_results_file.pl =================================================================== --- trunk/pstamp/scripts/pstamp_results_file.pl (revision 25738) +++ trunk/pstamp/scripts/pstamp_results_file.pl (revision 25739) @@ -90,4 +90,5 @@ { name => 'TESS_ID', type => '64A', writetype => TSTRING }, { name => 'COMPONENT', type => '64A', writetype => TSTRING }, + { name => 'LABEL', type => '64A', writetype => TSTRING }, # output parameters @@ -104,4 +105,5 @@ { name => 'WIDTH', type => 'D', writetype => TDOUBLE }, { name => 'HEIGHT', type => 'D', writetype => TDOUBLE }, + { name => 'COMMENT', type => '64A', writetype => TSTRING }, ]; Index: trunk/pstamp/scripts/pstampparse.pl =================================================================== --- trunk/pstamp/scripts/pstampparse.pl (revision 25738) +++ trunk/pstamp/scripts/pstampparse.pl (revision 25739) @@ -668,4 +668,9 @@ return 0 if ($r1->{IMG_TYPE} ne $r2->{IMG_TYPE}); return 0 if ($r1->{ID} ne $r2->{ID}); + return 0 if ($r1->{TESS_ID} ne $r2->{TESS_ID}); + return 0 if ($r1->{REQFILT} ne $r2->{REQFILT}); + return 0 if ($r1->{LABEL} ne $r2->{LABEL}); + return 0 if ($r1->{MJDMIN} ne $r2->{MJDMAX}); + return 0 if ($r1->{MJDMAX} ne $r2->{MJDMAX}); return 0 if ($r1->{inverse} ne $r2->{inverse}); Index: trunk/pstamp/test/asteroid.txt =================================================================== --- trunk/pstamp/test/asteroid.txt (revision 25738) +++ trunk/pstamp/test/asteroid.txt (revision 25739) @@ -16,13 +16,13 @@ # - # These coordinates get stamps from warp and diff images that show a moving object that mops found. -# ROWNUM PROJECT JOB_TYPE OPTION_MASK REQ_TYPE IMG_TYPE ID TESS_ID COMPONENT COORD_MASK CENTER_X CENTER_Y WIDTH HEIGHT REQFILT MJD_MIN MJD_MAX - -1 gpc1 stamp 3 bydiff warp 362483 NULL NULL 2 284.688522833822 -3.86916140936841 200 200 null 0 0 -2 gpc1 stamp 3 bydiff diff 362483 NULL NULL 2 284.688522833822 -3.86916140936841 200 200 null 0 0 -3 gpc1 stamp 1027 bydiff warp 362483 NULL NULL 2 284.688522833822 -3.86916140936841 200 200 null 0 0 -4 gpc1 stamp 1027 bydiff diff 362483 NULL NULL 2 284.688522833822 -3.86916140936841 200 200 null 0 0 +# ID | ROI Specification | JOB Specification | Images of interest specification +# ROWNUM CENTER_X CENTER_Y WIDTH HEIGHT COORD_MASK JOB_TYPE OPTION_MASK PROJECT REQ_TYPE IMG_TYPE ID TESS_ID COMPONENTLABEL REQFILT MJD_MIN MJD_MAX | COMMENT +# +1 284.688522833822 -3.86916140936841 200 200 2 stamp 3 gpc1 bydiff warp 362483 NULL NULL null null 0 0 | +2 284.688522833822 -3.86916140936841 200 200 2 stamp 3 gpc1 bydiff diff 362483 NULL NULL null null 0 0 | +3 284.688522833822 -3.86916140936841 200 200 2 stamp 1027 gpc1 bydiff warp 362483 NULL NULL null null 0 0 | +4 284.688522833822 -3.86916140936841 200 200 2 stamp 1027 gpc1 bydiff diff 362483 NULL NULL null null 0 0 | Index: trunk/pstamp/test/gpc1_sample.txt =================================================================== --- trunk/pstamp/test/gpc1_sample.txt (revision 25738) +++ trunk/pstamp/test/gpc1_sample.txt (revision 25739) @@ -15,32 +15,31 @@ # subsequent lines define the rows in the table -# ROWNUM PROJECT JOB_TYPE OPTION_MASK REQ_TYPE IMG_TYPE ID TESS_ID COMPONENT COORD_MASK CENTER_X CENTER_Y WIDTH HEIGHT REQFILT MJD_MIN MJD_MAX +## ID | ROI Specification | JOB Specification | Images of interest specification +# ROWNUM CENTER_X CENTER_Y WIDTH HEIGHT COORD_MASK JOB_TYPE OPTION_MASK PROJECT REQ_TYPE IMG_TYPE ID TESS_ID COMPONENT LABEL REQFILT MJD_MIN MJD_MAX | COMMENT # warps from various epochs for one of the SN candidates. Specifiying the skycell speeds up processing -1 gpc1 stamp 1 byid warp 6245 null skycell.077 2 242.400666 55.273513 200 200 null 0 0 -2 gpc1 stamp 1 byid warp 6254 null skycell.077 2 242.400666 55.273513 200 200 null 0 0 -3 gpc1 stamp 1 byid warp 6264 null skycell.077 2 242.400666 55.273513 200 200 null 0 0 -4 gpc1 stamp 1 byid warp 6317 null skycell.077 2 242.400666 55.273513 200 200 null 0 0 -5 gpc1 stamp 1 byid warp 6324 null skycell.077 2 242.400666 55.273513 200 200 null 0 0 -6 gpc1 stamp 1 byid warp 6465 null skycell.077 2 242.400666 55.273513 200 200 null 0 0 -7 gpc1 stamp 1 byid warp 6466 null skycell.077 2 242.400666 55.273513 200 200 null 0 0 - +1 242.400666 55.273513 200 200 2 stamp 1 gpc1 byid warp 6245 null skycell.077 null null 0 0 | +2 242.400666 55.273513 200 200 2 stamp 1 gpc1 byid warp 6254 null skycell.077 null null 0 0 | +3 242.400666 55.273513 200 200 2 stamp 1 gpc1 byid warp 6264 null skycell.077 null null 0 0 | +4 242.400666 55.273513 200 200 2 stamp 1 gpc1 byid warp 6317 null skycell.077 null null 0 0 | +5 242.400666 55.273513 200 200 2 stamp 1 gpc1 byid warp 6324 null skycell.077 null null 0 0 | +6 242.400666 55.273513 200 200 2 stamp 1 gpc1 byid warp 6465 null skycell.077 null null 0 0 | +7 242.400666 55.273513 200 200 2 stamp 1 gpc1 byid warp 6466 null skycell.077 null null 0 0 | # get a specific warp -10 gpc1 stamp 1 byid warp 6316 null skycell.077 2 242.400666 55.273513 200 200 null 0 0 +10 242.400666 55.273513 200 200 2 stamp 1 gpc1 byid warp 6316 null skycell.077 null null 0 0 | # get stamps from all warps for exposure (only destreaked ones will succeed) -11 gpc1 stamp 1 byexp warp o4973g0123o null skycell.077 2 242.400666 55.273513 200 200 null 0 0 +11 242.400666 55.273513 200 200 2 stamp 1 gpc1 byexp warp o4973g0123o null skycell.077 null null 0 0 | # get stamps from all chipRuns for exposure (only destreaked ones will succeed) # add the mask and weight images as well -12 gpc1 stamp 7 byexp chip o4973g0123o null null 2 242.400666 55.273513 200 200 null 0 0 +12 242.400666 55.273513 200 200 2 stamp 7 gpc1 byexp chip o4973g0123o null skycell.077 null null 0 0 | # get the corresponding diff -13 gpc1 stamp 1 byexp diff o4973g0123o null null 2 242.400666 55.273513 200 200 null 0 0 +13 242.400666 55.273513 200 200 2 stamp 1 gpc1 byexp diff o4973g0123o null null null null 0 0 | -# get the stack that was the templae for that stack -14 gpc1 stamp 1 byid stack 14031 null null 2 242.400666 55.273513 200 200 null 0 0 -# +# get the stack that was the template for that stack +14 242.400666 55.273513 200 200 2 stamp 1 gpc1 byid stack 14031 null null null null 0 0 | + # get the same stamp by go through the diff -15 gpc1 stamp 1 bydiff stack 193939 null null 2 242.400666 55.273513 200 200 null 0 0 - +15 242.400666 55.273513 200 200 2 stamp 1 gpc1 bydiff stack 193939 null null null null 0 0 |