IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34241


Ignore:
Timestamp:
Jul 31, 2012, 11:38:18 AM (14 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-20120627
Files:
36 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20120627/extsrc/gpcsw/gpcsrc/fits/burntool/persistio.c

    r26766 r34241  
    132132/* Assess the clustering of all the streaks */
    133133   for(i=0; i<MAXSIZE; i++) xusage[i] = 0;
     134   for(i=0; i<MAXSIZE; i++) boxid[i] = -1;
    134135   for(k=0; k<nbox; k++) {
    135136      if(box[k].exfit >= MAXSIZE-1) continue;
    … …  
    188189         for(jp=kp+1; jp<n; jp++) {
    189190            j = boxid[jp];
     191            /* CZW: Since I added the initialization statement above, */
     192            /*      any box with boxid == -1 hasn't been set, and */
     193            /*      therefore needs to be dropped, I think. */
     194            if ((k < 0)||(j < 0)) { continue; }
    190195            if(ABS(yctr[jp]-yctr[kp]) <= DIFFERENT_STREAK) {
    191196/* Merge k into j, trash k from further consideration */

  • branches/eam_branches/ipp-20120627/ippMonitor

  • branches/eam_branches/ipp-20120627/ippMonitor/def/histogramBackgroundImage.d

    r28604 r34241  
    1616FIELD rawExp.camera,             10, %s,     Camera,          restrict
    1717FIELD rawExp.dateobs,            19, %T,     Date/Time,       restrict
     18FIELD camRun.label,              10, %s,     Label,           restrict
    1819FIELD rawExp.ra,                  8, %C,     RA,              restrict
    1920FIELD rawExp.decl,                8, %C,     DEC,             restrict

  • branches/eam_branches/ipp-20120627/ippMonitor/def/histogramCamProcessedExpImage.d

    r28601 r34241  
    1616FIELD rawExp.camera,             10, %s,     Camera,          restrict
    1717FIELD rawExp.dateobs,            19, %T,     Date/Time,       restrict
     18FIELD camRun.label,              10, %s,     Label,           restrict
    1819FIELD rawExp.ra,                  8, %C,     RA,              restrict
    1920FIELD rawExp.decl,                8, %C,     DEC,             restrict

  • branches/eam_branches/ipp-20120627/ippMonitor/def/histogramZptObsImage.d

    r28604 r34241  
    1616FIELD rawExp.camera,             10, %s,     Camera,          restrict
    1717FIELD rawExp.dateobs,            19, %T,     Date/Time,       restrict
     18FIELD camRun.label,              10, %s,     Label,           restrict
    1819FIELD rawExp.ra,                  8, %C,     RA,              restrict
    1920FIELD rawExp.decl,                8, %C,     DEC,             restrict

  • branches/eam_branches/ipp-20120627/ippMonitor/def/scatterPlotAirMassFwhmImage.d

    r28601 r34241  
    1717FIELD rawExp.camera,             10, %s,     Camera,          restrict
    1818FIELD rawExp.dateobs,            19, %T,     Date/Time,       restrict
     19FIELD camRun.label,              10, %s,     Label,           restrict
    1920FIELD rawExp.ra,                  8, %C,     RA,              restrict
    2021FIELD rawExp.decl,                8, %C,     DEC,             restrict

  • branches/eam_branches/ipp-20120627/ippMonitor/def/simplePlotCamImage.d

    r28603 r34241  
    1414FIELD rawExp.camera,             10, %s,     Camera,          restrict
    1515FIELD rawExp.dateobs,            19, %T,     Date/Time,       restrict
     16FIELD camRun.label,              10, %s,     Label,           restrict
    1617FIELD rawExp.ra,                  8, %C,     RA,              restrict
    1718FIELD rawExp.decl,                8, %C,     DEC,             restrict

  • branches/eam_branches/ipp-20120627/ippMonitor/def/simplePlotChipImage.d

    r28601 r34241  
    1313FIELD rawExp.camera,             10, %s,     Camera,          restrict
    1414FIELD rawExp.dateobs,            19, %T,     Date/Time,       restrict
     15FIELD chipRun.label,              10, %s,     Label,          restrict
    1516FIELD rawExp.ra,                  8, %C,     RA,              restrict
    1617FIELD rawExp.decl,                8, %C,     DEC,             restrict

  • branches/eam_branches/ipp-20120627/ippMonitor/raw/czartool_labels.php

    r34139 r34241  
    168168echo "<tr><td>Postage stamp server status</td><td><a href=\"http://pstamp.ipp.ifa.hawaii.edu/status.php\"><font color=\"blue\">here</font></a></td></tr>";
    169169echo "<tr><td>Documentation</td><td><a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing\"><font color=\"blue\">here</font></a></td></tr>";
    170 echo "<tr><td>Cluster load</td><td><a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&hc=6&c=IPP%2520Production\"><font color=\"blue\">here</font></a> <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?m=cpu_report&r=hour&s=by%2520name&c=IPP+Production&h=&sh=1&hc=8&z=small\"><font color=\"blue\">cpu_report</font></a></td></tr>";
     170echo "<tr><td>Cluster load</td><td><a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&hc=6&c=IPP%2520Production\"><font color=\"blue\">here</font></a> <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?m=cpu_report&r=hour&s=by%2520name&c=IPP+Production&h=&sh=1&hc=8&z=small\"><font color=\"blue\">cpu_report</font></a> <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?m=mem_report&r=hour&s=by%2520name&c=IPP+Production&h=&sh=1&hc=8&z=small\"><font color=\"blue\">mem_report</font></a></td></tr>";
    171171echo "<tr><td>Who's using the cluster?</td><td><a href=\"http://ippmonitor.ipp.ifa.hawaii.edu/ippMonitor/clusterMonitor/top.html\"><font color=\"blue\">here</font></a></td></tr>";
    172172echo "<tr><td>Files monitor</td><td><a href=\"http://ippmonitor.ipp.ifa.hawaii.edu/diskMonitor\"><font color=\"blue\">here</font></a></td></tr>";

  • branches/eam_branches/ipp-20120627/ippScripts/scripts/destreak_restore_camera.pl

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20120627/ippScripts/scripts/ipp_apply_burntool_single.pl

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20120627/ippScripts/scripts/magic_destreak.pl

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20120627/ippScripts/scripts/nightly_science.pl

    r34018 r34241  
    10061006        $cmd .= " -set_reduction NIGHTLY_STACK ";
    10071007    }
     1008    if (defined($science_config{$target}{ADDITIONAL_STACK_LABEL})) {
     1009        # Grab list of skycells
     1010        my $skycell_select = '';
     1011        {
     1012            my %skycells = ();
     1013            my $warpcmd = "$warptool -warped -label $label -data_group $data_group  -dbname $dbname";
     1014            my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
     1015                run(command => $warpcmd, verbose => $verbose);
     1016            unless($success) {
     1017                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
     1018                &my_die("Unabel to perform warptool -warped to determine skycell_ids: $error_code",$target);
     1019            }
     1020            my $runs = $mdcParser->parse_list(join "", @$stdout_buf) or
     1021                &my_die("Unabel to parse warptool -warped to determine skycell_ids: $error_code",$target);
     1022            if ($#{ $runs } != -1) {
     1023                for my $warp (@$runs) {
     1024                    $skycells{$warp->{skycell_id}} = 1;
     1025                }
     1026                foreach my $skycell (sort (keys (%skycells))) {
     1027                    $skycell_select .= " -skycell $skycell ";
     1028                }
     1029                $cmd .= " -select_label $science_config{$target}{ADDITIONAL_STACK_LABEL} $skycell_select ";
     1030            }
     1031        }
     1032    }
    10081033    $cmd .= " $select ";
    10091034    if ($debug == 1) {

  • branches/eam_branches/ipp-20120627/ippScripts/scripts/skycalibration.pl

    r33974 r34241  
    134134my $file;
    135135if (!$singlefilter) {
    136     $file = $ipprc->filename('PSPHOT.STACK.OUTPUT', "$path_base.stk", $stack_id);
     136    $file = $ipprc->filename('PSPHOT.STACK.OUTPUT', $path_base, $stack_id);
    137137    if (! $ipprc->file_resolve($file)) {
    138138        # XXX: Beginning of section that can be removed eventually

  • branches/eam_branches/ipp-20120627/ippToPsps

    • Property svn:mergeinfo deleted

  • branches/eam_branches/ipp-20120627/ippToPsps/config/OB/tables.vot

    r33759 r34241  
    7575        <DESCRIPTION>total number of detection measurements in all filters</DESCRIPTION>
    7676      </FIELD>
    77       <FIELD name="raMean" arraysize="1" datatype="double" unit="degree">
    78         <DESCRIPTION> mean RA of object</DESCRIPTION>
    79       </FIELD>
    80       <FIELD name="decMean" arraysize="1" datatype="double" unit="degree">
    81         <DESCRIPTION> mean DEC of object</DESCRIPTION>
    82       </FIELD>
    83       <FIELD name="raMeanErr" arraysize="1" datatype="float" unit="arcsec">
    84         <DESCRIPTION> estimated error in raMean</DESCRIPTION>
    85       </FIELD>
    86       <FIELD name="decMeanErr" arraysize="1" datatype="float" unit="arcsec">
    87         <DESCRIPTION> estimated error in decMean</DESCRIPTION>
     77      <FIELD name="gStackPSFFluxErr" arraysize="1" datatype="double" unit="mag">
     78        <DESCRIPTION> estimated error in g stack psf flux</DESCRIPTION>
     79      </FIELD>
     80      <FIELD name="rStackPSFFluxErr" arraysize="1" datatype="double" unit="mag">
     81        <DESCRIPTION> estimated error in r stack psf flux</DESCRIPTION>
     82      </FIELD>
     83      <FIELD name="iStackPSFFluxErr" arraysize="1" datatype="float" unit="mag">
     84        <DESCRIPTION> estimated error in i stack psf flux</DESCRIPTION>
     85      </FIELD>
     86      <FIELD name="zStackPSFFluxErr" arraysize="1" datatype="float" unit="mag">
     87        <DESCRIPTION> estimated error in z stack psf flux</DESCRIPTION>
    8888      </FIELD>
    8989      <FIELD name="ng" arraysize="1" datatype="short" unit="unknown">
    9090        <DESCRIPTION>number of measures in g filter</DESCRIPTION>
    9191      </FIELD>
    92       <FIELD name="gMeanMag" arraysize="1" datatype="float" unit="mag">
    93         <DESCRIPTION> mean g magnitude</DESCRIPTION>
    94       </FIELD>
    95       <FIELD name="gMeanFlux" arraysize="1" datatype="float" unit="mag">
    96         <DESCRIPTION> mean g flux</DESCRIPTION>
    97       </FIELD>
    98       <FIELD name="gMeanMagErr" arraysize="1" datatype="float" unit="mag">
    99         <DESCRIPTION> estimated error of g magnitude mean</DESCRIPTION>
    100       </FIELD>
    101       <FIELD name="gMeanFluxErr" arraysize="1" datatype="float" unit="mag">
    102         <DESCRIPTION> estimated error of g flux mean</DESCRIPTION>
    103       </FIELD>
    104       <FIELD name="gMin" arraysize="1" datatype="float" unit="mag">
    105         <DESCRIPTION> minimum g magnitide</DESCRIPTION>
    106       </FIELD>
    107       <FIELD name="gMax" arraysize="1" datatype="float" unit="mag">
    108         <DESCRIPTION> maximum g magnitude</DESCRIPTION>
     92      <FIELD name="gMeanPSFMag" arraysize="1" datatype="float" unit="mag">
     93        <DESCRIPTION> mean g psf magnitude</DESCRIPTION>
     94      </FIELD>
     95      <FIELD name="gMeanKronMag" arraysize="1" datatype="float" unit="mag">
     96        <DESCRIPTION> mean g kron mag</DESCRIPTION>
     97      </FIELD>
     98      <FIELD name="gMeanPSFMagErr" arraysize="1" datatype="float" unit="mag">
     99        <DESCRIPTION> estimated error of g psf magnitude mean</DESCRIPTION>
     100      </FIELD>
     101      <FIELD name="gMeanKronMagErr" arraysize="1" datatype="float" unit="mag">
     102        <DESCRIPTION> estimated error of g kron mean mag</DESCRIPTION>
     103      </FIELD>
     104      <FIELD name="g20pct" arraysize="1" datatype="float" unit="mag">
     105        <DESCRIPTION> 20 pct g magnitude</DESCRIPTION>
     106      </FIELD>
     107      <FIELD name="g80pct" arraysize="1" datatype="float" unit="mag">
     108        <DESCRIPTION> 80 pct g magnitude</DESCRIPTION>
    109109      </FIELD>
    110110      <FIELD name="nr" arraysize="1" datatype="short" unit="unknown">
    111111        <DESCRIPTION>number of measures in r filter</DESCRIPTION>
    112112      </FIELD>
    113       <FIELD name="rMeanMag" arraysize="1" datatype="float" unit="mag">
    114         <DESCRIPTION> mean r magnitude</DESCRIPTION>
    115       </FIELD>
    116       <FIELD name="rMeanFlux" arraysize="1" datatype="float" unit="mag">
    117         <DESCRIPTION> mean r flux</DESCRIPTION>
    118       </FIELD>
    119       <FIELD name="rMeanMagErr" arraysize="1" datatype="float" unit="mag">
    120         <DESCRIPTION> estimated error of r magnitude mean</DESCRIPTION>
    121       </FIELD>
    122       <FIELD name="rMeanFluxErr" arraysize="1" datatype="float" unit="mag">
    123         <DESCRIPTION> estimated error of r flux mean</DESCRIPTION>
    124       </FIELD>
    125       <FIELD name="rMin" arraysize="1" datatype="float" unit="mag">
    126         <DESCRIPTION> minimum r magnitude</DESCRIPTION>
    127       </FIELD>
    128       <FIELD name="rMax" arraysize="1" datatype="float" unit="mag">
    129         <DESCRIPTION> maximum r magnitude</DESCRIPTION>
     113      <FIELD name="rMeanPSFMag" arraysize="1" datatype="float" unit="mag">
     114        <DESCRIPTION> mean r psf magnitude</DESCRIPTION>
     115      </FIELD>
     116      <FIELD name="rMeanKronMag" arraysize="1" datatype="float" unit="mag">
     117        <DESCRIPTION> mean r kron mag</DESCRIPTION>
     118      </FIELD>
     119      <FIELD name="rMeanPSFMagErr" arraysize="1" datatype="float" unit="mag">
     120        <DESCRIPTION> estimated error of r psf magnitude mean</DESCRIPTION>
     121      </FIELD>
     122      <FIELD name="rMeanKronMagErr" arraysize="1" datatype="float" unit="mag">
     123        <DESCRIPTION> estimated error of r mean kron mag</DESCRIPTION>
     124      </FIELD>
     125      <FIELD name="r20pct" arraysize="1" datatype="float" unit="mag">
     126        <DESCRIPTION> 20 pct r magnitude</DESCRIPTION>
     127      </FIELD>
     128      <FIELD name="r80pct" arraysize="1" datatype="float" unit="mag">
     129        <DESCRIPTION> 80 pct r magnitude</DESCRIPTION>
    130130      </FIELD>
    131131      <FIELD name="ni" arraysize="1" datatype="short" unit="unknown">
    132132        <DESCRIPTION>number of measures in i filter</DESCRIPTION>
    133133      </FIELD>
    134       <FIELD name="iMeanMag" arraysize="1" datatype="float" unit="mag">
    135         <DESCRIPTION> mean i magnitude</DESCRIPTION>
    136       </FIELD>
    137       <FIELD name="iMeanFlux" arraysize="1" datatype="float" unit="mag">
    138         <DESCRIPTION> mean i flux</DESCRIPTION>
    139       </FIELD>
    140       <FIELD name="iMeanMagErr" arraysize="1" datatype="float" unit="mag">
    141         <DESCRIPTION> estimated error of i magitude mean</DESCRIPTION>
    142       </FIELD>
    143       <FIELD name="iMeanFluxErr" arraysize="1" datatype="float" unit="mag">
    144         <DESCRIPTION> estimated error of i flux mean</DESCRIPTION>
    145       </FIELD>
    146       <FIELD name="iMin" arraysize="1" datatype="float" unit="mag">
    147         <DESCRIPTION> minimum i magniutde</DESCRIPTION>
    148       </FIELD>
    149       <FIELD name="iMax" arraysize="1" datatype="float" unit="mag">
    150         <DESCRIPTION> maximum i magnitude</DESCRIPTION>
     134      <FIELD name="iMeanPSFMag" arraysize="1" datatype="float" unit="mag">
     135        <DESCRIPTION> mean psf i magnitude</DESCRIPTION>
     136      </FIELD>
     137      <FIELD name="iMeanKronMag" arraysize="1" datatype="float" unit="mag">
     138        <DESCRIPTION> mean i kron mag</DESCRIPTION>
     139      </FIELD>
     140      <FIELD name="iMeanPSFMagErr" arraysize="1" datatype="float" unit="mag">
     141        <DESCRIPTION> estimated error of i psf magitude mean</DESCRIPTION>
     142      </FIELD>
     143      <FIELD name="iMeanKronMagErr" arraysize="1" datatype="float" unit="mag">
     144        <DESCRIPTION> estimated error of i kron mag mean</DESCRIPTION>
     145      </FIELD>
     146      <FIELD name="i20pct" arraysize="1" datatype="float" unit="mag">
     147        <DESCRIPTION> 20 pct i magniutde</DESCRIPTION>
     148      </FIELD>
     149      <FIELD name="i80pct" arraysize="1" datatype="float" unit="mag">
     150        <DESCRIPTION> 80 pct i magnitude</DESCRIPTION>
    151151      </FIELD>
    152152      <FIELD name="nz" arraysize="1" datatype="short" unit="mag">
    153153        <DESCRIPTION> number of measures in z filter</DESCRIPTION>
    154154      </FIELD>
    155       <FIELD name="zMeanMag" arraysize="1" datatype="float" unit="mag">
    156         <DESCRIPTION> mean z magnitude</DESCRIPTION>
    157       </FIELD>
    158       <FIELD name="zMeanFlux" arraysize="1" datatype="float" unit="mag">
    159         <DESCRIPTION> mean z flux</DESCRIPTION>
    160       </FIELD>
    161       <FIELD name="zMeanMagErr" arraysize="1" datatype="float" unit="mag">
    162         <DESCRIPTION> estimated error of z magnitude mean</DESCRIPTION>
    163       </FIELD>
    164       <FIELD name="zMeanFluxErr" arraysize="1" datatype="float" unit="mag">
    165         <DESCRIPTION> estimated error of z flux mean</DESCRIPTION>
    166       </FIELD>
    167       <FIELD name="zMin" arraysize="1" datatype="float" unit="mag">
    168         <DESCRIPTION> minimum z magnitude</DESCRIPTION>
    169       </FIELD>
    170       <FIELD name="zMax" arraysize="1" datatype="float" unit="mag">
    171         <DESCRIPTION> maximum z magnitude</DESCRIPTION>
     155      <FIELD name="zMeanPSFMag" arraysize="1" datatype="float" unit="mag">
     156        <DESCRIPTION> mean z psf magnitude</DESCRIPTION>
     157      </FIELD>
     158      <FIELD name="zMeanKronMag" arraysize="1" datatype="float" unit="mag">
     159        <DESCRIPTION> mean z kron mag</DESCRIPTION>
     160      </FIELD>
     161      <FIELD name="zMeanPSFMagErr" arraysize="1" datatype="float" unit="mag">
     162        <DESCRIPTION> estimated error of z psf magnitude mean</DESCRIPTION>
     163      </FIELD>
     164      <FIELD name="zMeanKronMagErr" arraysize="1" datatype="float" unit="mag">
     165        <DESCRIPTION> estimated error of z mean kron mag</DESCRIPTION>
     166      </FIELD>
     167      <FIELD name="z20pct" arraysize="1" datatype="float" unit="mag">
     168        <DESCRIPTION> 20 pct z magnitude</DESCRIPTION>
     169      </FIELD>
     170      <FIELD name="z80pct" arraysize="1" datatype="float" unit="mag">
     171        <DESCRIPTION> 80 pct z magnitude</DESCRIPTION>
    172172      </FIELD>
    173173      <FIELD name="ny" arraysize="1" datatype="short" unit="unknown">
    174174        <DESCRIPTION>number of measures in y filter</DESCRIPTION>
    175175      </FIELD>
    176       <FIELD name="yMeanMag" arraysize="1" datatype="float" unit="mag">
    177         <DESCRIPTION> mean y magnitude</DESCRIPTION>
    178       </FIELD>
    179       <FIELD name="yMeanFlux" arraysize="1" datatype="float" unit="mag">
    180         <DESCRIPTION> mean y flux</DESCRIPTION>
    181       </FIELD>
    182       <FIELD name="yMeanMagErr" arraysize="1" datatype="float" unit="mag">
    183         <DESCRIPTION> estimated error of y magnitude mean</DESCRIPTION>
    184       </FIELD>
    185       <FIELD name="yMeanFluxErr" arraysize="1" datatype="float" unit="mag">
    186         <DESCRIPTION> estimated error of y flux mean</DESCRIPTION>
    187       </FIELD>
    188       <FIELD name="yMin" arraysize="1" datatype="float" unit="mag">
    189         <DESCRIPTION> minimum y magnitude</DESCRIPTION>
    190       </FIELD>
    191       <FIELD name="yMax" arraysize="1" datatype="float" unit="mag">
    192         <DESCRIPTION> maximum y magnitude</DESCRIPTION>
     176      <FIELD name="yMeanPSFMag" arraysize="1" datatype="float" unit="mag">
     177        <DESCRIPTION> mean y psf magnitude</DESCRIPTION>
     178      </FIELD>
     179      <FIELD name="yMeanKronMag" arraysize="1" datatype="float" unit="mag">
     180        <DESCRIPTION> mean y kron mag</DESCRIPTION>
     181      </FIELD>
     182      <FIELD name="yMeanPSFMagErr" arraysize="1" datatype="float" unit="mag">
     183        <DESCRIPTION> estimated error of y psf magnitude mean</DESCRIPTION>
     184      </FIELD>
     185      <FIELD name="yMeanKronMagErr" arraysize="1" datatype="float" unit="mag">
     186        <DESCRIPTION> estimated error of y kron mag mean</DESCRIPTION>
     187      </FIELD>
     188      <FIELD name="y20pct" arraysize="1" datatype="float" unit="mag">
     189        <DESCRIPTION> 20 pct y magnitude</DESCRIPTION>
     190      </FIELD>
     191      <FIELD name="y80pct" arraysize="1" datatype="float" unit="mag">
     192        <DESCRIPTION> 80 pct y magnitude</DESCRIPTION>
    193193      </FIELD>
    194194      <FIELD name="nw" arraysize="1" datatype="short" unit="unknown">
    195195        <DESCRIPTION>number of measures in the wide (w) solar system filter</DESCRIPTION>
    196196      </FIELD>
    197       <FIELD name="wMeanMag" arraysize="1" datatype="float" unit="mag">
    198         <DESCRIPTION> mean w magnitude</DESCRIPTION>
    199       </FIELD>
    200       <FIELD name="wMeanFlux" arraysize="1" datatype="float" unit="mag">
    201         <DESCRIPTION> mean w flux</DESCRIPTION>
    202       </FIELD>
    203       <FIELD name="wMeanMagErr" arraysize="1" datatype="float" unit="mag">
    204         <DESCRIPTION> estimated error of w magnitude mean</DESCRIPTION>
    205       </FIELD>
    206       <FIELD name="wMeanFluxErr" arraysize="1" datatype="float" unit="mag">
    207         <DESCRIPTION> estimated error of w flux mean</DESCRIPTION>
    208       </FIELD>
    209       <FIELD name="wMin" arraysize="1" datatype="float" unit="mag">
    210         <DESCRIPTION> minimum w magnitude</DESCRIPTION>
    211       </FIELD>
    212       <FIELD name="wMax" arraysize="1" datatype="float" unit="mag">
    213         <DESCRIPTION> maximum w magnitude</DESCRIPTION>
    214       </FIELD>
    215       <FIELD name="grMeanColor" arraysize="1" datatype="float" unit="mag">
    216         <DESCRIPTION> g-r color from gMean &amp;amp; rMean</DESCRIPTION>
    217       </FIELD>
    218       <FIELD name="riMeanColor" arraysize="1" datatype="float" unit="mag">
    219         <DESCRIPTION> r-i color from rMean &amp;amp; iMean</DESCRIPTION>
    220       </FIELD>
    221       <FIELD name="izMeanColor" arraysize="1" datatype="float" unit="mag">
    222         <DESCRIPTION> i-z color from iMean &amp;amp; zMean</DESCRIPTION>
    223       </FIELD>
    224       <FIELD name="zyMeanColor" arraysize="1" datatype="float" unit="mag">
    225         <DESCRIPTION> z-y color from zMean &amp;amp; yMean</DESCRIPTION>
    226       </FIELD>
    227       <FIELD name="grMeanColorErr" arraysize="1" datatype="float" unit="mag">
    228         <DESCRIPTION> Estimated error in g-r color from gMean &amp;amp; rMean</DESCRIPTION>
    229       </FIELD>
    230       <FIELD name="riMeanColorErr" arraysize="1" datatype="float" unit="mag">
    231         <DESCRIPTION> Estimated error in r-i color from rMean &amp;amp; iMean</DESCRIPTION>
    232       </FIELD>
    233       <FIELD name="izMeanColorErr" arraysize="1" datatype="float" unit="mag">
    234         <DESCRIPTION> Estimated error in i-z color from iMean &amp;amp; zMean</DESCRIPTION>
    235       </FIELD>
    236       <FIELD name="zyMeanColorErr" arraysize="1" datatype="float" unit="mag">
    237         <DESCRIPTION> Estimated error in z-y color from zMean &amp;amp; yMean</DESCRIPTION>
    238       </FIELD>
    239       <FIELD name="gMagBest" arraysize="1" datatype="float" unit="mag">
    240         <DESCRIPTION> g magnitude from stack frames</DESCRIPTION>
    241       </FIELD>
    242       <FIELD name="gModID" arraysize="1" datatype="short" unit="unknown">
    243         <DESCRIPTION>index of which g model magnitude was used from stack</DESCRIPTION>
    244       </FIELD>
    245       <FIELD name="rMagBest" arraysize="1" datatype="float" unit="mag">
    246         <DESCRIPTION> r magnitude from stack frames</DESCRIPTION>
    247       </FIELD>
    248       <FIELD name="rModID" arraysize="1" datatype="short" unit="unknown">
    249         <DESCRIPTION>index of which r model magnitude was used from stack</DESCRIPTION>
    250       </FIELD>
    251       <FIELD name="iMagBest" arraysize="1" datatype="float" unit="mag">
    252         <DESCRIPTION> i magnitude from stack frames</DESCRIPTION>
    253       </FIELD>
    254       <FIELD name="iModID" arraysize="1" datatype="short" unit="unknown">
    255         <DESCRIPTION>index of which i model magnitude was used from stack</DESCRIPTION>
    256       </FIELD>
    257       <FIELD name="zMagBest" arraysize="1" datatype="float" unit="mag">
    258         <DESCRIPTION> z magnitude from stack frames</DESCRIPTION>
    259       </FIELD>
    260       <FIELD name="zModID" arraysize="1" datatype="short" unit="unknown">
    261         <DESCRIPTION>index of which z model magnitude was used from stack</DESCRIPTION>
    262       </FIELD>
    263       <FIELD name="yMagBest" arraysize="1" datatype="float" unit="mag">
    264         <DESCRIPTION> y magnitude from stack frames</DESCRIPTION>
    265       </FIELD>
    266       <FIELD name="yModID" arraysize="1" datatype="short" unit="unknown">
    267         <DESCRIPTION>index of which y model magnitude was used from stack</DESCRIPTION>
    268       </FIELD>
    269       <FIELD name="grColor" arraysize="1" datatype="float" unit="unknown">
    270         <DESCRIPTION>g-r color from gmag and rmag</DESCRIPTION>
    271       </FIELD>
    272       <FIELD name="riColor" arraysize="1" datatype="float" unit="unknown">
    273         <DESCRIPTION>r-i color from rmag and imag</DESCRIPTION>
    274       </FIELD>
    275       <FIELD name="izColor" arraysize="1" datatype="float" unit="unknown">
    276         <DESCRIPTION>i-z color from imag and zmag</DESCRIPTION>
    277       </FIELD>
    278       <FIELD name="zyColor" arraysize="1" datatype="float" unit="unknown">
    279         <DESCRIPTION>z-y color from zmag and ymag</DESCRIPTION>
     197      <FIELD name="wMeanPSFMag" arraysize="1" datatype="float" unit="mag">
     198        <DESCRIPTION> mean w psf magnitude</DESCRIPTION>
     199      </FIELD>
     200      <FIELD name="wMeanKronMag" arraysize="1" datatype="float" unit="mag">
     201        <DESCRIPTION> mean w kron mag</DESCRIPTION>
     202      </FIELD>
     203      <FIELD name="wMeanPSFMagErr" arraysize="1" datatype="float" unit="mag">
     204        <DESCRIPTION> estimated error of w psf magnitude mean</DESCRIPTION>
     205      </FIELD>
     206      <FIELD name="wMeanKronMagErr" arraysize="1" datatype="float" unit="mag">
     207        <DESCRIPTION> estimated error of w kron mag mean</DESCRIPTION>
     208      </FIELD>
     209      <FIELD name="w20pct" arraysize="1" datatype="float" unit="mag">
     210        <DESCRIPTION> 20 pct w magnitude</DESCRIPTION>
     211      </FIELD>
     212      <FIELD name="w80pct" arraysize="1" datatype="float" unit="mag">
     213        <DESCRIPTION> 80 pct w magnitude</DESCRIPTION>
     214      </FIELD>
     215      <FIELD name="gStackPSFFlux" arraysize="1" datatype="float" unit="mag">
     216        <DESCRIPTION> g stack psf flux </DESCRIPTION>
     217      </FIELD>
     218      <FIELD name="rStackPSFFlux" arraysize="1" datatype="float" unit="mag">
     219        <DESCRIPTION> r stack psf flux </DESCRIPTION>
     220      </FIELD>
     221      <FIELD name="iStackPSFFlux" arraysize="1" datatype="float" unit="mag">
     222        <DESCRIPTION> i stack psf flux </DESCRIPTION>
     223      </FIELD>
     224      <FIELD name="zStackPSFFlux" arraysize="1" datatype="float" unit="mag">
     225        <DESCRIPTION> z stack psf flux </DESCRIPTION>
     226      </FIELD>
     227      <FIELD name="gStackKronMagErr" arraysize="1" datatype="float" unit="mag">
     228        <DESCRIPTION> error from g stack kron mag</DESCRIPTION>
     229      </FIELD>
     230      <FIELD name="rStackKronMagErr" arraysize="1" datatype="float" unit="mag">
     231        <DESCRIPTION> error from r stack kron mag</DESCRIPTION>
     232      </FIELD>
     233      <FIELD name="iStackKronMagErr" arraysize="1" datatype="float" unit="mag">
     234        <DESCRIPTION> error from i stack kron mag</DESCRIPTION>
     235      </FIELD>
     236      <FIELD name="zStackKronMagErr" arraysize="1" datatype="float" unit="mag">
     237        <DESCRIPTION> error from z stack kron mag</DESCRIPTION>
     238      </FIELD>
     239      <FIELD name="gStackKronMag" arraysize="1" datatype="float" unit="mag">
     240        <DESCRIPTION> g kron magnitude from stack frames</DESCRIPTION>
     241      </FIELD>
     242      <FIELD name="gFlags" arraysize="1" datatype="short" unit="unknown">
     243        <DESCRIPTION>flags for g stack</DESCRIPTION>
     244      </FIELD>
     245      <FIELD name="rStackKronMag" arraysize="1" datatype="float" unit="mag">
     246        <DESCRIPTION> r kron magnitude from stack frames</DESCRIPTION>
     247      </FIELD>
     248      <FIELD name="rFlags" arraysize="1" datatype="short" unit="unknown">
     249        <DESCRIPTION>flags for r stack</DESCRIPTION>
     250      </FIELD>
     251      <FIELD name="iStackKronMag" arraysize="1" datatype="float" unit="mag">
     252        <DESCRIPTION> i kron magnitude from stack frames</DESCRIPTION>
     253      </FIELD>
     254      <FIELD name="iFlags" arraysize="1" datatype="short" unit="unknown">
     255        <DESCRIPTION>flags for i stack</DESCRIPTION>
     256      </FIELD>
     257      <FIELD name="zStackKronMag" arraysize="1" datatype="float" unit="mag">
     258        <DESCRIPTION> z kron magnitude from stack frames</DESCRIPTION>
     259      </FIELD>
     260      <FIELD name="zFlags" arraysize="1" datatype="short" unit="unknown">
     261        <DESCRIPTION>flags for z stack</DESCRIPTION>
     262      </FIELD>
     263      <FIELD name="yStackKronMag" arraysize="1" datatype="float" unit="mag">
     264        <DESCRIPTION> y kron magnitude from stack frames</DESCRIPTION>
     265      </FIELD>
     266      <FIELD name="yFlags" arraysize="1" datatype="short" unit="unknown">
     267        <DESCRIPTION>flags for y stack</DESCRIPTION>
     268      </FIELD>
     269      <FIELD name="yStackPSFFlux" arraysize="1" datatype="float" unit="unknown">
     270        <DESCRIPTION>y band stack PSF flux</DESCRIPTION>
     271      </FIELD>
     272      <FIELD name="yStackKronMagErr" arraysize="1" datatype="float" unit="unknown">
     273        <DESCRIPTION>y band stack kron mag err</DESCRIPTION>
     274      </FIELD>
     275      <FIELD name="yStackPSFFluxErr" arraysize="1" datatype="float" unit="unknown">
     276        <DESCRIPTION>y band stack psf flux err</DESCRIPTION>
     277      </FIELD>
     278      <FIELD name="extra" arraysize="1" datatype="float" unit="unknown">
     279        <DESCRIPTION>currently unused</DESCRIPTION>
    280280      </FIELD>
    281281      <FIELD name="sgSep" arraysize="1" datatype="float" unit="unknown">

  • branches/eam_branches/ipp-20120627/ippToPsps/jython/objectbatch.py

    r34103 r34241  
    118118                   SET \
    119119                   n" + filter[1] + " = NCODE \
    120                    ," + filter[1] + "MeanMag = MAG \
    121                    ," + filter[1] + "MeanFlux = 3631 * POW(10.0, (-0.4*MAG)) \
    122                    ," + filter[1] + "MeanMagErr = MAG_ERR \
    123                    ," + filter[1] + "Min = MAG_20/1000 \
    124                    ," + filter[1] + "Max = MAG_80/1000 \
     120                   ," + filter[1] + "MeanPSFMag = MAG \
     121                   ," + filter[1] + "MeanPSFMagErr = MAG_ERR \
     122                   ," + filter[1] + "20pct = MAG_20/1000 \
     123                   ," + filter[1] + "80pct = MAG_80/1000 \
    125124                   "
    126125           
    … …  
    133132
    134133            sql = "UPDATE Object \
    135                    SET " + filter[1] + "MeanMagErr = null \
    136                    WHERE " + filter[1] + "MeanMagErr > " + str(cut)
     134                   SET " + filter[1] + "MeanPSFMagErr = null \
     135                   WHERE " + filter[1] + "MeanPSFMagErr > " + str(cut)
    137136            self.scratchDb.execute(sql)
    138137
    … …  
    167166        cpsTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cps")
    168167
    169         self.logger.infoPair("Populating", "ObjectCalColor")
     168        self.logger.infoPair("Populating", "Object")
    170169        self.logger.infoPair("Inserting objects from", "cpt file")
    171170
    … …  
    203202            self.logger.errorPair("Couldn't populate Object table", sql)
    204203            return False
    205 
     204 
    206205        # add row count columns so we can perform joins to get colors
    207206        self.logger.infoPair("Adding 'row' columns to", "Object and cps tables")
    … …  
    211210        self.insertMags(cpsTableName)
    212211
    213         self.updateColors()
     212#don't do this as we removed those columns..
     213#        self.updateColors()
     214
     215        #objects can have out of range ra dec in dvo - need to find and kill them at the end
     216
     217        self.logger.infoPair("Determining", "ra/dec range")
     218
     219        raMin = self.scratchDb.getFromdvoSkyTable("R_MIN",self.region)
     220        raMax = self.scratchDb.getFromdvoSkyTable("R_MAX",self.region)
     221        decMin = self.scratchDb.getFromdvoSkyTable("D_MIN",self.region)
     222        decMax = self.scratchDb.getFromdvoSkyTable("D_MAX",self.region)
     223
     224        self.logger.infoPair("R_MIN", raMin)
     225        self.logger.infoPair("R_MAX", raMax)
     226        self.logger.infoPair("D_MIN", decMin)
     227        self.logger.infoPair("D_MAX", decMax)
     228        #count out of range
     229
     230        sql = "SELECT count(*) FROM Object where Object.dec > " + str(decMax) + " or Object.dec < " + str(decMin) + " or Object.ra > " + str(raMax) + " or Object.ra < " + str(raMin)       
     231   
     232        rs = self.scratchDb.executeQuery(sql)
     233        rs.first()
     234        nToDelete = rs.getInt(1)
     235       
     236        #delete out of range
     237       
     238 
     239        sql = "DELETE FROM Object where Object.dec > " + str(decMax) + " or Object.dec < " + str(decMin) + " or Object.ra > " + str(raMax) + " or Object.ra < " + str(raMin)
     240        self.logger.infoPair("Deleting", str(nToDelete) + " objects outside of ra/dec range")
     241
     242        try:
     243            self.scratchDb.execute(sql)
     244        except:
     245            self.logger.errorPair("Couldn't cull outsiders from Object table", sql)
     246            return False
    214247
    215248        self.logger.infoPair("Dropping row column from", "Object table")
    216249        self.scratchDb.dropColumn("Object", "row")
    217250        self.logger.infoPair("Purging from scratch Db", self.region + " region")
     251
    218252        self.dvoObjects.purgeRegion(self.region)
    219253

  • branches/eam_branches/ipp-20120627/ippToPsps/jython/plot.py

    r33740 r34241  
    4040            OUTPUTFILE = self.config.name + "_" + batchType + "_" + timestamp + ".png"
    4141
    42         f = os.popen('gnuplot', 'w')
     42        f = os.popen('/home/panstarrs/ipp/local/bin/gnuplot', 'w')
    4343           
    4444        if 0:

  • branches/eam_branches/ipp-20120627/ippToPsps/jython/scratchdb.py

    r34103 r34241  
    593593        return orderedFilters
    594594
     595
     596    def getRaDecRangesFromdvoSkyTable(self, name):
     597     
     598        sql = "SELECT R_MIN, R_MAX, D_MIN, D_MAX FROM dvoSkyTable WHERE NAME = '" + name + "' limit 1"
     599        try:
     600            rs = self.executeQuery(sql)
     601            rs.first()
     602            raMin = rs.getFloat(1)
     603            raMax = rs.getFloat(2)
     604            decMin = rs.getFloat(3)
     605            decMax = rs.getFloat(4)
     606           
     607        except:
     608            self.logger.errorPair("no ra/decs found for", name)
     609            raMin = -999
     610            raMax = -999
     611            decMin = -999
     612            decMax = -999
     613
     614        return raMin, raMax, decMin, decMax
     615 
     616    def getFromdvoSkyTable(self, column, name):
     617     
     618        sql = "SELECT "+column + " FROM dvoSkyTable WHERE NAME = '" + name + "' limit 1"
     619        try:
     620            rs = self.executeQuery(sql)
     621            rs.first()
     622            res = rs.getDouble(1)
     623                       
     624        except:
     625            self.logger.errorPair("no ra/decs found for", name)
     626            res = -999
     627           
     628
     629        return res

  • branches/eam_branches/ipp-20120627/ippToPsps/jython/stackbatch.py

    r33962 r34241  
    397397
    398398        self.scratchDb.execute(sql)
     399        #it is possible to drop some detections from dvo (that are present in the cmf). when that happens we get a 0 for objid
     400        #we drop those...
     401        sql="DELETE FROM StackDetection where objID = 0"
     402        self.scratchDb.execute(sql)
     403        self.logger.infoPair("Deleting", "entries with StackDetection.objID = 0")
    399404
    400405        self.scratchDb.updateAllRows("StackDetection", "surveyID", str(self.surveyID))
    … …  
    421426        self.scratchDb.reportAndDeleteRowsWithNULLS("StackDetection", "instFlux")
    422427        self.scratchDb.reportAndDeleteRowsWithNULLS("StackDetection", "objID")
     428        sql="DELETE FROM StackDetection where objID = 0"
     429        self.scratchDb.execute(sql)
     430        self.logger.infoPair("Deleting", "entries with StackDetection.objID = 0")
    423431
    424432

  • branches/eam_branches/ipp-20120627/ippTools/share/camtool_find_pendingimfile.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20120627/ippTools/share/chiptool_setimfiletoupdate.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20120627/ippTools/share/pxadmin_create_tables.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20120627/ippTools/share/warptool_towarped.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20120627/ippTools/src

  • branches/eam_branches/ipp-20120627/ippTools/src/disttool.c

    r34081 r34241  
    743743
    744744    query = "DELETE FROM distComponent where dist_id = %" PRId64;
     745    char *query2 =  "DELETE from rcDSFileset using distRun, rcDSFileset WHERE distRun.dist_id = rcDSFileset.dist_id AND rcDSFileset.state ='cleaned' AND dist_id = %" PRId64;
    745746   
    746747    for (long i=0; i < psArrayLength(output); i++) {
    … …  
    753754        }
    754755
     756        // delete any existing distComponents
    755757        if (!p_psDBRunQueryF(config->dbh, query, dist_id)) {
     758            psError(PS_ERR_UNKNOWN, false, "database error");
     759            psFree(query);
     760            if (!psDBRollback(config->dbh)) {
     761                psError(PS_ERR_UNKNOWN, false, "database error");
     762            }
     763            return false;
     764        }
     765        // delete any exisiting fileset
     766        if (!p_psDBRunQueryF(config->dbh, query2, dist_id)) {
    756767            psError(PS_ERR_UNKNOWN, false, "database error");
    757768            psFree(query);

  • branches/eam_branches/ipp-20120627/ippTools/src/magictool.c

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20120627/ippTools/src/pxtools.c

    r32565 r34241  
    301301    PXOPT_LOOKUP_STR(note, config->args,        "-set_note", false, false);
    302302
     303#ifdef DISALLOW_CHANGE_TO_UPDATE
     304    // Back in the days of magic we didn't allow state changes of Run's
     305    // to update because the interaction with destreaking was problematic
     306    // With the death of magic we can allow this now.
    303307    if ((state)&&(!strcmp(state, "update"))) {
    304308        fprintf(stderr, "'-updaterun -set_state update' is not supported.");
    … …  
    310314        exit(1);
    311315    }
    312 
     316#endif
    313317    psString dist_group = NULL;
    314318    if (has_dist_group) {
    … …  
    350354    psString joinHook = psStringCopy("");
    351355    psString fileWhere = NULL;
     356
     357#ifdef DISALLOW_CHANGE_TO_UPDATE
    352358    if (state && !strcmp(state, "update")) {
    353359        psStringAppend(&joinHook, "\n JOIN %s USING(%s)", fileTable, idColumn);
    … …  
    355361        psStringAppend(&fileWhere, "AND %s.data_state = 'cleaned'", fileTable);
    356362    }
     363#endif
    357364
    358365    psString whereClause =  psDBGenerateWhereSQL(where, NULL);

  • branches/eam_branches/ipp-20120627/ippTools/src/staticskytool.c

    r34081 r34241  
    11441144static bool updateskycalrunMode(pxConfig *config)
    11451145{
    1146 #ifdef notyet
    11471146    PS_ASSERT_PTR_NON_NULL(config, false);
    11481147
    11491148    psMetadata *where = psMetadataAlloc();
    1150     PXOPT_COPY_S64(config->args, where, "-sky_id",  "sky_id",   "==");
     1149    PXOPT_COPY_S64(config->args, where, "-skycal_id",  "skycal_id",   "==");
    11511150    PXOPT_COPY_STR(config->args, where, "-label",   "label",    "==");
    11521151    PXOPT_COPY_STR(config->args, where, "-state",   "state",    "==");
    … …  
    11571156    }
    11581157
    1159     psString query = psStringCopy("UPDATE staticskyRun");
     1158    psString query = psStringCopy("UPDATE skycalRun");
    11601159
    11611160    // pxUpdateRun gets parameters from config->args and updates
    1162     bool result = pxUpdateRun(config, where, &query, "staticskyRun", "sky_id", "staticskyResult", true, false);
     1161    bool result = pxUpdateRun(config, where, &query, "skycalRun", "skycal_id", "skycalResult", true, false);
    11631162    psFree(query);
    11641163    psFree(where);
    11651164
    11661165    return result;
    1167 #endif
    1168     return false;
    1169 }
     1166}
     1167
    11701168static bool pendingskycalrunMode(pxConfig *config)
    11711169{
    … …  
    13701368    PXOPT_COPY_S64(config->args, where, "-skycal_id",  "skycalRun.skycal_id", "==");
    13711369    PXOPT_COPY_S64(config->args, where, "-sky_id",     "skycalRun.sky_id", "==");
    1372     PXOPT_COPY_S64(config->args, where, "-stack_id",   "skycalRun.stack_id", "==");
     1370    PXOPT_COPY_S64(config->args, where, "-stack_id",   "stackRun.stack_id", "==");
    13731371    PXOPT_COPY_STR(config->args, where, "-tess_id",    "stackRun.tess_id", "LIKE");
    13741372    PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "LIKE");
    … …  
    14471445
    14481446    psMetadata *where = psMetadataAlloc();
    1449     PXOPT_COPY_S64(config->args, where, "-skycal_id", "staticskyResult.sky_id", "==");
    1450     pxAddLabelSearchArgs(config, where, "-label", "staticskyRun.label", "==");
    1451     pxAddLabelSearchArgs(config, where, "-data_group", "staticskyRun.data_group", "==");
     1447    PXOPT_COPY_S64(config->args, where, "-skycal_id", "skycalResult.skycal_id", "==");
     1448    pxAddLabelSearchArgs(config, where, "-label", "skycalRun.label", "==");
     1449    pxAddLabelSearchArgs(config, where, "-data_group", "skycalRun.data_group", "==");
    14521450    pxAddLabelSearchArgs(config, where, "-filter", "stackRun.filter", "==");
    1453     PXOPT_COPY_S16(config->args, where, "-fault", "staticskyResult.fault", "==");
     1451    PXOPT_COPY_S16(config->args, where, "-fault", "skycalResult.fault", "==");
    14541452
    14551453    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {

  • branches/eam_branches/ipp-20120627/ippTools/src/staticskytoolConfig.c

    r33919 r34241  
    171171    // -updateskycalrun
    172172    psMetadata *updateskycalrunArgs = psMetadataAlloc();
    173     psMetadataAddS64(updateskycalrunArgs, PS_LIST_TAIL, "-sky_id", 0, "search by stack ID", 0);
     173    psMetadataAddS64(updateskycalrunArgs, PS_LIST_TAIL, "-skycal_id", 0, "search by skycal ID", 0);
    174174    psMetadataAddStr(updateskycalrunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL);
    175175    psMetadataAddStr(updateskycalrunArgs, PS_LIST_TAIL, "-label", 0, "search by label", 0);
    … …  
    218218    // -revertskycal
    219219    psMetadata *revertskycalArgs= psMetadataAlloc();
    220     psMetadataAddS64(revertskycalArgs, PS_LIST_TAIL, "-skycal_id", 0, "search by staticsky ID", 0);
     220    psMetadataAddS64(revertskycalArgs, PS_LIST_TAIL, "-skycal_id", 0, "search by skycal ID", 0);
    221221    psMetadataAddStr(revertskycalArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", 0);
    222222    psMetadataAddStr(revertskycalArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by data_group", 0);

  • branches/eam_branches/ipp-20120627/pstamp/scripts

  • branches/eam_branches/ipp-20120627/pstamp/scripts/pstamp_checkdependent.pl

    r33056 r34241  
    331331        return $error_code
    332332    }
    333     if (($state eq 'update') and ($metadata->{fault})) {
     333    if (($data_state eq 'full') and ($metadata->{fault})) {
    334334        # fault dependent.
    335335        my $fault = $metadata->{fault};
    336336        print STDERR "warp $warp_id $skycell_id faulted: $fault";
    337337        return $fault;
     338    }
     339    if ($metadata->{quality} ne 0) {
     340        print STDERR "warp $warp_id $skycell_id bad quality on update: $metadata->{quality}\n";
     341        return $PSTAMP_GONE;
    338342    }
    339343
    … …  
    466470                return $warp_status;
    467471            }
    468         }
     472        } elsif ($warp1->{quality} != 0) {
     473            print STDERR "warp $warp1->{warp_id} $skycell_id has poor quality: $warp1->{quality}\n";
     474            faultComponent('diff', $diff_id, $skycell_id, $PSTAMP_GONE);
     475            return $PSTAMP_GONE;
     476        }
    469477        $command = "$warptool -warped -warp_id $skycell->{warp2} -skycell_id $skycell_id";
    470478        my $warp2 = runToolAndParseExpectOne($command, $verbose);
    … …  
    477485                faultComponent('diff', $diff_id, $skycell_id, $PSTAMP_GONE);
    478486            }
    479         }
     487        } elsif ($warp2->{quality} != 0) {
     488            print STDERR "warp $warp2->{warp_id} $skycell_id has poor quality: $warp2->{quality}\n";
     489            faultComponent('diff', $diff_id, $skycell_id, $PSTAMP_GONE);
     490            return $PSTAMP_GONE;
     491        }
    480492
    481493        if (!$warps_ready) {

  • branches/eam_branches/ipp-20120627/pstamp/scripts/pstamp_parser_run.pl

    r33126 r34241  
    127127if ($uri =~ /^http:/) {
    128128    # if the uri is an http uri download the file
    129     my $command = "$dsget --uri $uri --filename $new_uri";
     129    my $command = "$dsget --uri $uri --filename $new_uri --timeout 120";
    130130    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
    131131        run(command => $command, verbose => $verbose);

  • branches/eam_branches/ipp-20120627/psvideophot

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20120627/tools/who_uses_the_cluster/_who_uses_the_cluster.sh

    r33496 r34241  
    4040    ipp050 ipp051 ipp052 ipp053 ipp054 ipp055 ipp056 ipp057 ipp058 ipp059\
    4141    ipp060 ipp061 ipp062 ipp063 ipp064 ipp065 ipp066\
    42     stare00 stare01 stare02 stare03 stare04"
     42    stare00 stare01 stare02 stare03 stare04\
     43    ippb00 ippb01 ippb02 ippb03\
     44    stsci00 stsci01 stsci02 stsci03 stsci04\
     45    stsci05 stsci06 stsci07 stsci08 stsci09"
    4346
    4447# Basename of the files

  • branches/eam_branches/ipp-20120627/tools/who_uses_the_cluster/_who_uses_the_cluster_analyze.pl

    r33496 r34241  
    2424    ippc50 ippc51 ippc52 ippc53 ippc54 ippc55 ippc56 ippc57 ippc58 ippc59
    2525    ippc60 ippc61 ippc62 ippc63
    26     ippdb00 ippdb01 ippdb02 ippdb03 stare00 stare01 stare02 stare03 stare04/;
     26    ippdb00 ippdb01 ippdb02 ippdb03 stare00 stare01 stare02 stare03 stare04
     27    ippb00 ippb01 ippb02 ippb03
     28    stsci00 stsci01 stsci02 stsci03 stsci04
     29    stsci05 stsci06 stsci07 stsci08 stsci09/;
    2730
    2831print "<html>\n";
    29 print "<head><title>Who uses the system?</title></head>\n";
     32print "<head><title>Who is using the system?</title></head>\n";
    3033print "<body>\n";
    31 print "<b>To get info, move the mouse pointer over the table cell. !Warning! Command lines can be truncated</b><br/><br/><br/>\n";
     34print "<b>This script is run from ippc18 (ipp user crontab). To get info, move the mouse pointer over the table cells to get more details. !Warning! Command lines can be truncated</b><br/><br/><br/>\n";
    3235print "<table border=\"1\">\n";
    3336# Scan each logfile
Note: See TracChangeset for help on using the changeset viewer.