IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jan 11, 2007, 3:38:56 PM (19 years ago)
Author:
jhoblitt
Message:

require ippdb 0.0.73
merge rawScienceExp & rawDetrnedExp -> rawExp table
p0tool fault handling refactoring:

rename -updateimfile -> -addprocessedimfile
rename -updatexp -> -addprocessedexp
rename -faultimfile -> -updatedprocessedimfile
rename -faultexp -> -updateprocessedexp
rename -rawifmile -> -processedimfile
add -processedexp
remove newExp.fault & newImfile.fault
add rawImfile.fault & rawExp.fault

remove pxframes.c from the build and the related prototypes from pxtools.h

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/regtoolConfig.c

    r10988 r11047  
    4141    }
    4242
     43    // -pendingimfile
     44    psMetadata *pendingimfileArgs = psMetadataAlloc();
     45    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
     46        "search by exposure ID", NULL);
     47    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class",  0,
     48        "search by class", NULL);
     49    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id",  0,
     50        "search by class ID", NULL);
     51    psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit",  0,
     52        "limit result set to N items", 0);
     53    psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple",  0,
     54        "use the simple output format", false);
     55
     56    // -addprocessedimfile
     57    psMetadata *addprocessedimfileArgs = psMetadataAlloc();
     58    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
     59        "search by exposure ID", NULL);
     60    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class",  0,
     61        "search by class", NULL);
     62    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
     63        "search by class ID", NULL);
     64    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_type",  0,
     65        "define exposure type", NULL);
     66    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-filter",  0,
     67        "define filter ", NULL);
     68    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-airmass",  0,
     69        "define airmass", NAN);
     70    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-ra",  0,
     71        "define RA", NAN);
     72    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-decl",  0,
     73        "define DEC", NAN);
     74    psMetadataAddF32(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_time",  0,
     75        "define exposure time", NAN);
     76    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg",  0,
     77        "define exposue background", NAN);
     78    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev",  0,
     79        "define exposue background stdev", NAN);
     80    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
     81        "define exposue background mean stdev", NAN);
     82    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-alt",  0,
     83        "define altitute", NAN);
     84    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-az",  0,
     85        "define azimuth", NAN);
     86    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-ccd_temp",  0,
     87        "define ccd tempature", NAN);
     88    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-posang",  0,
     89        "define rotator position angle", NAN);
     90    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-object",  0,
     91        "define exposure object", NULL);
     92    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-dateobs",  0,
     93        "define observation time", NULL);
     94    psMetadataAddS8(addprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,
     95        "set fault code (required)", 0);
     96
     97    // -processedimfile
     98    psMetadata *processedimfileArgs = psMetadataAlloc();
     99    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
     100        "search by exposure ID", NULL);
     101    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class",  0,
     102        "search by class", NULL);
     103    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
     104        "search by class ID", NULL);
     105    psMetadataAddU64(processedimfileArgs, PS_LIST_TAIL, "-limit",  0,
     106        "limit result set to N items", 0);
     107    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-faulted",  0,
     108        "only return imfiles with a fault status set", false);
     109    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple",  0,
     110        "use the simple output format", false);
     111
     112    // -updateprocessedimfile
     113    psMetadata *updateprocessedimfileArgs = psMetadataAlloc();
     114    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
     115        "search by exposure ID", NULL);
     116    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class",  0,
     117        "search by class", NULL);
     118    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
     119        "search by class ID", NULL);
     120    psMetadataAddS8(updateprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,
     121        "set fault code (required)", 0);
     122   
     123
    43124    // -pendingexp
    44125    psMetadata *pendingexpArgs = psMetadataAlloc();
    … …  
    55136    psMetadataAddU64(pendingexpArgs, PS_LIST_TAIL, "-limit",  0,
    56137        "limit result set to N items", 0);
    57     psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-faulted",  0,
    58         "only return imfiles with a fault status set", false);
    59138    psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple",  0,
    60139        "use the simple output format", false);
    61    
    62     // -pendingimfile
    63     psMetadata *pendingimfileArgs = psMetadataAlloc();
    64     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
    65         "search by exposure ID", NULL);
    66     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class",  0,
    67         "search by class", NULL);
    68     psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id",  0,
    69         "search by class ID", NULL);
    70     psMetadataAddU64(pendingimfileArgs, PS_LIST_TAIL, "-limit",  0,
    71         "limit result set to N items", 0);
    72     psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-faulted",  0,
    73         "only return imfiles with a fault status set", false);
    74     psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple",  0,
    75         "use the simple output format", false);
    76 
    77 
    78     // -updateexp
    79     psMetadata *updateexpArgs = psMetadataAlloc();
    80     psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-exp_tag",  0,
     140
     141    // -addprocessedexp
     142    psMetadata *addprocessedexpArgs = psMetadataAlloc();
     143    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_tag",  0,
    81144        "exp_tag to operate on (required)", NULL);
    82     psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-exp_type",  0,
     145    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_type",  0,
    83146        "define exposure type", NULL);
    84     psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-filter",  0,
     147    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filter",  0,
    85148        "define filter ", NULL);
    86     psMetadataAddF32(updateexpArgs, PS_LIST_TAIL, "-airmass",  0,
     149    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-airmass",  0,
    87150        "define airmass", NAN);
    88     psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-ra",  0,
     151    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-ra",  0,
    89152        "define RA", NAN);
    90     psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-decl",  0,
     153    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-decl",  0,
    91154        "define DEC", NAN);
    92     psMetadataAddF32(updateexpArgs, PS_LIST_TAIL, "-exp_time",  0,
     155    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-exp_time",  0,
    93156        "define exposure time", NAN);
    94     psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-bg",  0,
     157    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg",  0,
    95158        "define exposue background", NAN);
    96     psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-bg_stdev",  0,
     159    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev",  0,
    97160        "define exposue background stdev", NAN);
    98     psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
     161    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
    99162        "define exposue background mean stdev", NAN);
    100     psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-alt",  0,
     163    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-alt",  0,
    101164        "define altitute", NAN);
    102     psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-az",  0,
     165    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-az",  0,
    103166        "define azimuth", NAN);
    104     psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-ccd_temp",  0,
     167    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-ccd_temp",  0,
    105168        "define ccd tempature", NAN);
    106     psMetadataAddF64(updateexpArgs, PS_LIST_TAIL, "-posang",  0,
     169    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-posang",  0,
    107170        "define rotator position angle", NAN);
    108     psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-object",  0,
     171    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-object",  0,
    109172        "define exposure object", NULL);
    110     psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-dateobs",  0,
     173    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-dateobs",  0,
    111174        "define observation time", NULL);
    112     psMetadataAddStr(updateexpArgs, PS_LIST_TAIL, "-label",  0,
     175    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-label",  0,
    113176        "define label for phase 2 processing (non-detrend data only)", NULL);
     177    psMetadataAddS8(addprocessedexpArgs, PS_LIST_TAIL, "-code",  0,
     178        "set fault code (required)", 0);
    114179    /*
    115180    psMetadataAddStr(updateArgs, PS_LIST_TAIL, "-recip",  0,
    … …  
    118183        "define URL", NULL);
    119184    */
    120     psMetadataAddBool(updateexpArgs, PS_LIST_TAIL, "-detrend",  0,
     185    psMetadataAddBool(addprocessedexpArgs, PS_LIST_TAIL, "-detrend",  0,
    121186        "declare this as detrend data", false);
    122187
    123     // -faultexp
    124     psMetadata *faultexpArgs = psMetadataAlloc();
    125     psMetadataAddStr(faultexpArgs, PS_LIST_TAIL, "-exp_tag",  0,
    126         "search by exposure ID", NULL);
    127     psMetadataAddS8(faultexpArgs, PS_LIST_TAIL, "-code",  0,
     188    // -processedexp
     189    psMetadata *processedexpArgs = psMetadataAlloc();
     190    psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_tag",  0,
     191        "search by exposure ID", NULL);
     192    psMetadataAddU64(processedexpArgs, PS_LIST_TAIL, "-limit",  0,
     193        "limit result set to N items", 0);
     194    psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-faulted",  0,
     195        "only return imfiles with a fault status set", false);
     196    psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-simple",  0,
     197        "use the simple output format", false);
     198
     199    // -updatedprocessedexp
     200    psMetadata *updatedprocessedexpArgs = psMetadataAlloc();
     201    psMetadataAddStr(updatedprocessedexpArgs, PS_LIST_TAIL, "-exp_tag",  0,
     202        "search by exposure ID", NULL);
     203    psMetadataAddS8(updatedprocessedexpArgs, PS_LIST_TAIL, "-code",  0,
    128204        "set fault code (required)", 0);
    129205   
    130     // -updateimfile
    131     psMetadata *updateimfileArgs = psMetadataAlloc();
    132     psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
    133         "search by exposure ID", NULL);
    134     psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-class",  0,
    135         "search by class", NULL);
    136     psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-class_id",  0,
    137         "search by class ID", NULL);
    138     psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-exp_type",  0,
    139         "define exposure type", NULL);
    140     psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-filter",  0,
    141         "define filter ", NULL);
    142     psMetadataAddF32(updateimfileArgs, PS_LIST_TAIL, "-airmass",  0,
    143         "define airmass", NAN);
    144     psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-ra",  0,
    145         "define RA", NAN);
    146     psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-decl",  0,
    147         "define DEC", NAN);
    148     psMetadataAddF32(updateimfileArgs, PS_LIST_TAIL, "-exp_time",  0,
    149         "define exposure time", NAN);
    150     psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-bg",  0,
    151         "define exposue background", NAN);
    152     psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-bg_stdev",  0,
    153         "define exposue background stdev", NAN);
    154     psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
    155         "define exposue background mean stdev", NAN);
    156     psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-alt",  0,
    157         "define altitute", NAN);
    158     psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-az",  0,
    159         "define azimuth", NAN);
    160     psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-ccd_temp",  0,
    161         "define ccd tempature", NAN);
    162     psMetadataAddF64(updateimfileArgs, PS_LIST_TAIL, "-posang",  0,
    163         "define rotator position angle", NAN);
    164     psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-object",  0,
    165         "define exposure object", NULL);
    166     psMetadataAddStr(updateimfileArgs, PS_LIST_TAIL, "-dateobs",  0,
    167         "define observation time", NULL);
    168 
    169     // -faultimfile
    170     psMetadata *faultimfileArgs = psMetadataAlloc();
    171     psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
    172         "search by exposure ID", NULL);
    173     psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-class",  0,
    174         "search by class", NULL);
    175     psMetadataAddStr(faultimfileArgs, PS_LIST_TAIL, "-class_id",  0,
    176         "search by class ID", NULL);
    177     psMetadataAddS8(faultimfileArgs, PS_LIST_TAIL, "-code",  0,
    178         "set fault code (required)", 0);
    179    
    180     // -rawimfile
    181     psMetadata *rawimfileArgs = psMetadataAlloc();
    182     psMetadataAddStr(rawimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
    183         "search by exposure ID", NULL);
    184     psMetadataAddStr(rawimfileArgs, PS_LIST_TAIL, "-class_id",  0,
    185         "search by class ID", NULL);
    186     psMetadataAddBool(rawimfileArgs, PS_LIST_TAIL, "-simple",  0,
    187         "use the simple output format", false);
    188206
    189207#define PXTOOL_MODE(option, modeval, argset) \
    … …  
    207225    psMetadata *argSets = psMetadataAlloc();
    208226    // find which mode we're running under
    209     PXTOOL_MODE("-pendingexp",   P0TOOL_MODE_PENDINGEXP,    pendingexpArgs);
    210     PXTOOL_MODE("-pendingimfile",P0TOOL_MODE_PENDINGIMFILE, pendingimfileArgs);
    211     PXTOOL_MODE("-updateexp",    P0TOOL_MODE_UPDATEEXP,     updateexpArgs);
    212     PXTOOL_MODE("-faultexp",     P0TOOL_MODE_FAULTEXP,      faultexpArgs);
    213     PXTOOL_MODE("-updateimfile", P0TOOL_MODE_UPDATEIMFILE,  updateimfileArgs);
    214     PXTOOL_MODE("-faultimfile",  P0TOOL_MODE_FAULTIMFILE,   faultimfileArgs);
    215     PXTOOL_MODE("-rawimfile",    P0TOOL_MODE_RAWIMFILE,     rawimfileArgs);
     227    PXTOOL_MODE("-pendingimfile",   P0TOOL_MODE_PENDINGIMFILE, pendingimfileArgs);
     228    PXTOOL_MODE("-addprocessedimfile", P0TOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs);
     229    PXTOOL_MODE("-processedimfile", P0TOOL_MODE_PROCESSEDIMFILE, processedimfileArgs);
     230    PXTOOL_MODE("-updateprocessedimfile",  P0TOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileArgs);
     231    PXTOOL_MODE("-pendingexp",      P0TOOL_MODE_PENDINGEXP,pendingexpArgs);
     232    PXTOOL_MODE("-addprocessedexp", P0TOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
     233    PXTOOL_MODE("-processedexp",    P0TOOL_MODE_PROCESSEDEXP, processedexpArgs);
     234    PXTOOL_MODE("-updateprocessedexp", P0TOOL_MODE_UPDATEPROCESSEDEXP,      updatedprocessedexpArgs);
    216235
    217236    bool argErr = false;
Note: See TracChangeset for help on using the changeset viewer.