IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 13, 2017, 10:53:48 AM (9 years ago)
Author:
eugene
Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:
trunk/Ohana
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/relastro/include/relastro.h

    r39926 r40291  
    215215  unsigned int stop;
    216216  off_t myImage;
    217   float Mcal;
     217  float McalPSF;
     218  float McalAPER;
    218219  float dMcal;
    219   short Xm;
     220  float McalChiSq;
    220221  float secz;
    221222  char flags;
    … …  
    377378int    SKIP_CFH;
    378379
     380int    UPDATE_ALL_MEASURE;
    379381int    UPDATE_PS1_STACK_MEASURE;
    380382int    UPDATE_PS1_CHIP_MEASURE;

  • trunk/Ohana/src/relastro/src

  • trunk/Ohana/src/relastro/src/BrightCatalog.c

    r39995 r40291  
    6868    GET_COLUMN(D,         "DEC",        double);
    6969    GET_COLUMN(M,         "MAG_SYS",    float);
    70     GET_COLUMN(Mcal,      "MAG_CAL",    float);
     70    GET_COLUMN(McalPSF,   "MCAL_PSF",   float);
     71    GET_COLUMN(McalAPER,  "MCAL_APER",  float);
    7172    GET_COLUMN(dM,        "MAG_ERR",    float);
    7273    GET_COLUMN(airmass,   "AIRMASS",    float);
    … …  
    9495      measure[i].D         = D[i];
    9596      measure[i].M         = M[i];
    96       measure[i].Mcal      = Mcal[i];
     97      measure[i].McalPSF   = McalPSF[i];
     98      measure[i].McalAPER  = McalAPER[i];
    9799      measure[i].dM        = dM[i];
    98100      measure[i].airmass   = airmass[i];
    … …  
    120122    free (D       );
    121123    free (M       );
    122     free (Mcal    );
     124    free (McalPSF );
     125    free (McalAPER);
    123126    free (dM      );
    124127    free (airmass );
    … …  
    285288    ALLOCATE (secfilt, SecFilt, Nrow);
    286289    for (i = 0; i < Nrow; i++) {
    287       secfilt[i].M      = M[i];         
    288       secfilt[i].dM    = dM[i];
    289       secfilt[i].Mchisq = Mchisq[i];
    290       secfilt[i].flags  = flags[i];
    291       secfilt[i].Ncode  = Ncode[i];
    292       secfilt[i].Nused  = Nused[i];
    293       secfilt[i].Mmin   = Mmin[i];
    294       secfilt[i].Mmax   = Mmax[i];
     290      secfilt[i].MpsfChp  = M[i];         
     291      secfilt[i].dMpsfChp = dM[i];
     292      secfilt[i].Mchisq   = Mchisq[i];
     293      secfilt[i].flags    = flags[i];
     294      secfilt[i].Ncode    = Ncode[i];
     295      secfilt[i].Nused    = Nused[i];
     296      secfilt[i].Mmin     = Mmin[i];
     297      secfilt[i].Mmax     = Mmax[i];
    295298    }
    296299    // fprintf (stderr, "loaded data for %lld secfilt\n", (long long) Nrow);
    … …  
    385388    double *D         ; ALLOCATE (D        ,  double, catalog->Nmeasure);
    386389    float  *M         ; ALLOCATE (M        ,  float,  catalog->Nmeasure);
    387     float  *Mcal      ; ALLOCATE (Mcal     ,  float,  catalog->Nmeasure);
     390    float  *McalPSF   ; ALLOCATE (McalPSF  ,  float,  catalog->Nmeasure);
     391    float  *McalAPER  ; ALLOCATE (McalAPER ,  float,  catalog->Nmeasure);
    388392    float  *dM        ; ALLOCATE (dM       ,  float,  catalog->Nmeasure);
    389393    float  *airmass   ; ALLOCATE (airmass  ,  float,  catalog->Nmeasure);
    … …  
    408412      D[i]        = measure[i].D        ;
    409413      M[i]        = measure[i].M        ;
    410       Mcal[i]     = measure[i].Mcal     ;
     414      McalPSF[i]  = measure[i].McalPSF  ;
     415      McalAPER[i] = measure[i].McalAPER ;
    411416      dM[i]       = measure[i].dM       ;
    412417      airmass[i]  = measure[i].airmass  ;
    … …  
    434439    gfits_set_bintable_column (&theader, &ftable, "DEC",        D,         catalog->Nmeasure);
    435440    gfits_set_bintable_column (&theader, &ftable, "MAG_SYS",    M,         catalog->Nmeasure);
    436     gfits_set_bintable_column (&theader, &ftable, "MAG_CAL",    Mcal,      catalog->Nmeasure);
     441    gfits_set_bintable_column (&theader, &ftable, "MCAL_PSF",   McalPSF,   catalog->Nmeasure);
     442    gfits_set_bintable_column (&theader, &ftable, "MCAL_APER",  McalAPER,  catalog->Nmeasure);
    437443    gfits_set_bintable_column (&theader, &ftable, "MAG_ERR",    dM,        catalog->Nmeasure);
    438444    gfits_set_bintable_column (&theader, &ftable, "AIRMASS",    airmass,   catalog->Nmeasure);
    … …  
    454460    free (D       );
    455461    free (M       );
    456     free (Mcal    );
     462    free (McalPSF );
     463    free (McalAPER);
    457464    free (dM      );
    458465    free (airmass );
    … …  
    694701    SecFilt *secfilt = catalog->secfilt;
    695702    for (i = 0; i < Nsec; i++) {
    696       M     [i]       = secfilt[i].M      ;
    697       dM    [i]       = secfilt[i].dM     ;
    698       Mchisq[i]       = secfilt[i].Mchisq ;
    699       flags [i]       = secfilt[i].flags  ;
    700       Ncode [i]       = secfilt[i].Ncode  ;
    701       Nused [i]       = secfilt[i].Nused  ;
    702       Mmin  [i]       = secfilt[i].Mmin   ;
    703       Mmax  [i]       = secfilt[i].Mmax   ;
     703      M     [i]       = secfilt[i].MpsfChp ;
     704      dM    [i]       = secfilt[i].dMpsfChp;
     705      Mchisq[i]       = secfilt[i].Mchisq  ;
     706      flags [i]       = secfilt[i].flags   ;
     707      Ncode [i]       = secfilt[i].Ncode   ;
     708      Nused [i]       = secfilt[i].Nused   ;
     709      Mmin  [i]       = secfilt[i].Mmin    ;
     710      Mmax  [i]       = secfilt[i].Mmax    ;
    704711    }
    705712

  • trunk/Ohana/src/relastro/src/ImageOps.c

    r39926 r40291  
    431431  /**** dMcal vs airmass ****/
    432432  for (i = 0; i < Nimage; i++) {
    433     Mlist[i] = image[i].Mcal;
     433    Mlist[i] = image[i].McalPSF;
    434434    dlist[i] = image[i].dMcal;
    435435    xlist[i] = image[i].secz;
    … …  
    819819
    820820    if ((DCR_BLUE_NSEC_POS >= 0) && (DCR_BLUE_NSEC_NEG >= -1)) {
    821       ref[i].ColorBlue = catalog[c].secfilt[n*Nsecfilt + DCR_BLUE_NSEC_POS].M - catalog[c].secfilt[n*Nsecfilt + DCR_BLUE_NSEC_NEG].M;
     821      ref[i].ColorBlue = catalog[c].secfilt[n*Nsecfilt + DCR_BLUE_NSEC_POS].MpsfChp - catalog[c].secfilt[n*Nsecfilt + DCR_BLUE_NSEC_NEG].MpsfChp;
    822822    }
    823823    if ((DCR_RED_NSEC_POS >= 0) && (DCR_RED_NSEC_NEG >= -1)) {
    824       ref[i].ColorRed = catalog[c].secfilt[n*Nsecfilt + DCR_RED_NSEC_POS].M - catalog[c].secfilt[n*Nsecfilt + DCR_RED_NSEC_NEG].M;
     824      ref[i].ColorRed = catalog[c].secfilt[n*Nsecfilt + DCR_RED_NSEC_POS].MpsfChp - catalog[c].secfilt[n*Nsecfilt + DCR_RED_NSEC_NEG].MpsfChp;
    825825    }
    826826

  • trunk/Ohana/src/relastro/src/MosaicOps.c

    r39457 r40291  
    9797
    9898    /* a new mosaic, define ranges */
    99     mosaic[Nmosaic].start   = start;
    100     mosaic[Nmosaic].stop    = stop;
    101     mosaic[Nmosaic].Mcal    = 0.0;
    102     mosaic[Nmosaic].dMcal   = 0.0;
    103     mosaic[Nmosaic].Xm      = 0.0;
    104     mosaic[Nmosaic].flags   = image[i].flags;
    105     mosaic[Nmosaic].secz    = image[i].secz;
    106     mosaic[Nmosaic].coords  = image[i].coords;
    107     mosaic[Nmosaic].myImage = i;
     99    mosaic[Nmosaic].start     = start;
     100    mosaic[Nmosaic].stop      = stop;
     101    mosaic[Nmosaic].McalPSF   = 0.0;
     102    mosaic[Nmosaic].McalAPER  = 0.0;
     103    mosaic[Nmosaic].dMcal     = 0.0;
     104    mosaic[Nmosaic].McalChiSq = 0.0;
     105    mosaic[Nmosaic].flags     = image[i].flags;
     106    mosaic[Nmosaic].secz      = image[i].secz;
     107    mosaic[Nmosaic].coords    = image[i].coords;
     108    mosaic[Nmosaic].myImage   = i;
    108109
    109110    // init the mosaic_own_images array data

  • trunk/Ohana/src/relastro/src/UpdateMeasures.c

    r39926 r40291  
    114114      }
    115115
     116      // XXX this stuff is rather hackish, added to do GSC/HSC/Megacam astrometry
     117
     118      // only modify the chip coordinates
     119      if (UPDATE_ALL_MEASURE) {
     120        measureT->R = R;
     121        measureT->D = D;
     122        if (measureB) {
     123          measureB->R = R;
     124          measureB->D = D;
     125        }
     126        goto set_measure_done;
     127      }
    116128      // only modify the chip coordinates
    117129      if (UPDATE_PS1_STACK_MEASURE && isGPC1stack (measureT->photcode)) {
    … …  
    122134          measureB->D = D;
    123135        }
     136        goto set_measure_done;
    124137      }
    125138      // only modify the chip coordinates
    … …  
    131144          measureB->D = D;
    132145        }
    133       }
    134       // only modify the chip coordinates
    135       if (UPDATE_HSC_MEASURE && isGPC1chip (measureT->photcode)) {
    136         measureT->R = R;
    137         measureT->D = D;
    138         if (measureB) {
    139           measureB->R = R;
    140           measureB->D = D;
    141         }
    142       }
    143       // only modify the chip coordinates
    144       if (UPDATE_CFH_MEASURE && isGPC1chip (measureT->photcode)) {
    145         measureT->R = R;
    146         measureT->D = D;
    147         if (measureB) {
    148           measureB->R = R;
    149           measureB->D = D;
    150         }
    151       }
     146        goto set_measure_done;
     147      }
     148      // only modify the chip coordinates
     149      if (UPDATE_HSC_MEASURE && isHSCchip (measureT->photcode)) {
     150        measureT->R = R;
     151        measureT->D = D;
     152        if (measureB) {
     153          measureB->R = R;
     154          measureB->D = D;
     155        }
     156        goto set_measure_done;
     157      }
     158      // only modify the chip coordinates
     159      if (UPDATE_CFH_MEASURE && isCFHchip (measureT->photcode)) {
     160        measureT->R = R;
     161        measureT->D = D;
     162        if (measureB) {
     163          measureB->R = R;
     164          measureB->D = D;
     165        }
     166        goto set_measure_done;
     167      }
     168    set_measure_done:
     169      continue; // XXX this line is needed only to support the label above
    152170    }
    153171    if (VERBOSE) fprintf (stderr, "%s : Noff ori RA %d ( %d %d %d ), Noff ori DEC %d ( %d %d %d )\n", catalog[i].filename, NoffRAori, NoffRAchip, NoffRAstack, NoffRAwarp, NoffDECori, NoffDECchip, NoffDECstack, NoffDECwarp);

  • trunk/Ohana/src/relastro/src/UpdateObjectOffsets.c

    r39926 r40291  
    208208    if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
    209209
     210    if (UPDATE_ALL_MEASURE)       strextend (&command, "-update-all-cameras");
    210211    if (UPDATE_PS1_STACK_MEASURE) strextend (&command, "-update-ps1-stack");
    211     if (UPDATE_PS1_CHIP_MEASURE) strextend (&command, "-update-ps1-chip");
    212     if (UPDATE_HSC_MEASURE)      strextend (&command, "-update-hsc");
    213     if (UPDATE_CFH_MEASURE)      strextend (&command, "-update-cfh");
    214 
    215     if (UPDATE)        strextend (&command, "-update");
     212    if (UPDATE_PS1_CHIP_MEASURE)  strextend (&command, "-update-ps1-chip");
     213    if (UPDATE_HSC_MEASURE)       strextend (&command, "-update-hsc");
     214    if (UPDATE_CFH_MEASURE)       strextend (&command, "-update-cfh");
     215
     216    if (UPDATE)           strextend (&command, "-update");
    216217    if (RESET_BAD_IMAGES) strextend (&command, "-reset-bad-images");
    217     if (USE_BASIC_CHECK) strextend (&command, "-basic-image-search");
    218     if (USE_ALL_IMAGES)      strextend (&command, "-use-all-images");
     218    if (USE_BASIC_CHECK)  strextend (&command, "-basic-image-search");
     219    if (USE_ALL_IMAGES)   strextend (&command, "-use-all-images");
    219220
    220221    if (MinBadQF > 0.0)        strextend (&command, "-min-bad-psfqf %f", MinBadQF);
    … …  
    347348    if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
    348349
     350    if (UPDATE_ALL_MEASURE)       strextend (&command, "-update-all-cameras");
    349351    if (UPDATE_PS1_STACK_MEASURE) strextend (&command, "-update-ps1-stack");
    350     if (UPDATE_PS1_CHIP_MEASURE) strextend (&command, "-update-ps1-chip");
    351     if (UPDATE_HSC_MEASURE)      strextend (&command, "-update-hsc");
    352     if (UPDATE_CFH_MEASURE)      strextend (&command, "-update-cfh");
     352    if (UPDATE_PS1_CHIP_MEASURE)  strextend (&command, "-update-ps1-chip");
     353    if (UPDATE_HSC_MEASURE)       strextend (&command, "-update-hsc");
     354    if (UPDATE_CFH_MEASURE)       strextend (&command, "-update-cfh");
    353355
    354356    if (UPDATE)        strextend (&command, "-update");

  • trunk/Ohana/src/relastro/src/args.c

    r39926 r40291  
    158158  }
    159159
     160  UPDATE_ALL_MEASURE = FALSE;
     161  if ((N = get_argument (argc, argv, "-update-all-cameras"))) {
     162    remove_argument (N, &argc, argv);
     163    UPDATE_ALL_MEASURE = TRUE;
     164  }
    160165  UPDATE_PS1_STACK_MEASURE = FALSE;
    161166  if ((N = get_argument (argc, argv, "-update-ps1-stack"))) {
    … …  
    179184  }
    180185  if (RELASTRO_OP == OP_UPDATE_OFFSETS) {
    181     if (!UPDATE_PS1_STACK_MEASURE && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
    182       fprintf (stderr, "for -update-offsets, need to select at least one of -update-ps1-stack, -update-ps1-chip, -update-hsc, -update-cfh\n");
     186    if (!UPDATE_ALL_MEASURE && !UPDATE_PS1_STACK_MEASURE && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
     187      fprintf (stderr, "for -update-offsets, need to select at least one of -update-all-cameras, -update-ps1-stack, -update-ps1-chip, -update-hsc, -update-cfh\n");
    183188      exit (2);
    184189    }
    185190  }
    186191  if ((RELASTRO_OP == OP_PARALLEL_IMAGES) || (RELASTRO_OP == OP_IMAGES)) {
    187     if (APPLY_OFFSETS && !UPDATE_PS1_STACK_MEASURE && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
     192    if (APPLY_OFFSETS && !UPDATE_ALL_MEASURE && !UPDATE_PS1_STACK_MEASURE && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
    188193      fprintf (stderr, "for [-images or -parallel-images] with -apply-offsets, need to select at least one of -update-ps1-stack, -update-ps1-chip, -update-hsc, -update-cfh\n");
    189194      exit (2);
    … …  
    890895  }
    891896
     897  UPDATE_ALL_MEASURE = FALSE;
     898  if ((N = get_argument (argc, argv, "-update-all-cameras"))) {
     899    remove_argument (N, &argc, argv);
     900    UPDATE_ALL_MEASURE = TRUE;
     901  }
    892902  UPDATE_PS1_STACK_MEASURE = FALSE;
    893903  if ((N = get_argument (argc, argv, "-update-ps1-stack"))) {
    … …  
    911921  }
    912922  if (RELASTRO_OP == OP_UPDATE_OFFSETS) {
    913     if (!UPDATE_PS1_STACK_MEASURE && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
     923    if (!UPDATE_ALL_MEASURE && !UPDATE_PS1_STACK_MEASURE && !UPDATE_PS1_CHIP_MEASURE && !UPDATE_HSC_MEASURE && !UPDATE_CFH_MEASURE) {
    914924      fprintf (stderr, "for -update-offsets, need to select at least one of -update-ps1-stack, -update-ps1-chip, -update-hsc, -update-cfh\n");
    915925      exit (2);
Note: See TracChangeset for help on using the changeset viewer.