Changeset 33398

Timestamp:

Mar 4, 2012, 6:27:22 AM (14 years ago)

Author:

eugene

Message:

added PS1_V3 format to dvo

Location:

branches/eam_branches/ipp-20111122/Ohana/src/addstar

Files:

• src/find_matches.c (modified) (1 diff)
• src/find_matches_closest.c (modified) (1 diff)
• test/simple.dvo (modified) (4 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/find_matches.c

@@ -291 +291 @@
 
     for (j = 0; j < Nsecfilt; j++) {
-      catalog[0].secfilt[Nave*Nsecfilt+j].M     = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].dM    = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Xm    = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_20  = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_80  = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Ncode = 0;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Nused = 0;
+      catalog[0].secfilt[Nave*Nsecfilt+j].M           = NAN;
+      catalog[0].secfilt[Nave*Nsecfilt+j].Map         = NAN;
+      catalog[0].secfilt[Nave*Nsecfilt+j].dM          = NAN;
+      catalog[0].secfilt[Nave*Nsecfilt+j].Xm          = NAN_S_SHORT;
+      catalog[0].secfilt[Nave*Nsecfilt+j].M_20        = NAN_S_SHORT;
+      catalog[0].secfilt[Nave*Nsecfilt+j].M_80        = NAN_S_SHORT;
+      catalog[0].secfilt[Nave*Nsecfilt+j].Ncode       = 0;
+      catalog[0].secfilt[Nave*Nsecfilt+j].Nused       = 0;
+      catalog[0].secfilt[Nave*Nsecfilt+j].ubercalDist = 1000;
+      catalog[0].secfilt[Nave*Nsecfilt+j].flags       = 0;
+      catalog[0].secfilt[Nave*Nsecfilt+j].dummy[0]    = 0;
+      catalog[0].secfilt[Nave*Nsecfilt+j].dummy[1]    = 0;
     }
 

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/find_matches_closest.c

@@ -292 +292 @@
 
     for (j = 0; j < Nsecfilt; j++) {
-      catalog[0].secfilt[Nave*Nsecfilt+j].M  = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].dM = NAN;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Xm = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_20  = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].M_80  = NAN_S_SHORT;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Ncode = 0;
-      catalog[0].secfilt[Nave*Nsecfilt+j].Nused = 0;
+      catalog[0].secfilt[Nave*Nsecfilt+j].M           = NAN;
+      catalog[0].secfilt[Nave*Nsecfilt+j].Map         = NAN;
+      catalog[0].secfilt[Nave*Nsecfilt+j].dM          = NAN;
+      catalog[0].secfilt[Nave*Nsecfilt+j].Xm          = NAN_S_SHORT;
+      catalog[0].secfilt[Nave*Nsecfilt+j].M_20        = NAN_S_SHORT;
+      catalog[0].secfilt[Nave*Nsecfilt+j].M_80        = NAN_S_SHORT;
+      catalog[0].secfilt[Nave*Nsecfilt+j].Ncode       = 0;
+      catalog[0].secfilt[Nave*Nsecfilt+j].Nused       = 0;
+      catalog[0].secfilt[Nave*Nsecfilt+j].ubercalDist = 1000;
+      catalog[0].secfilt[Nave*Nsecfilt+j].flags       = 0;
+      catalog[0].secfilt[Nave*Nsecfilt+j].dummy[0]    = 0;
+      catalog[0].secfilt[Nave*Nsecfilt+j].dummy[1]    = 0;
     }
 

branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/simple.dvo

@@ -8 +8 @@
   test.fields PS1_V1    PS1_V1
   test.fields PS1_V2    PS1_V1
+  test.fields PS1_V3    PS1_V1
 
   test.fields PS1_DEV_0 PS1_V2
@@ -13 +14 @@
   test.fields PS1_V1    PS1_V2
   test.fields PS1_V2    PS1_V2
+  test.fields PS1_V3    PS1_V2
+
+  test.fields PS1_DEV_0 PS1_V3
+  test.fields PS1_DEV_1 PS1_V3
+  test.fields PS1_V1    PS1_V3
+  test.fields PS1_V2    PS1_V3
+  test.fields PS1_V3    PS1_V3
 end  
 
@@ -31 +39 @@
   mkinput
   exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1
-  exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2
+  exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
 
   list testfields -copy testfields_$1
@@ -220 +228 @@
   N_FRAMES          : SKIP # no accessor        
 end
+
+# this list is good for PS1_V3
+list testfields_PS1_V3
+  IPP_IDET          : detid     
+  X_PSF             : xccd      
+  Y_PSF             : yccd      
+  X_PSF_SIG         : xccd:err # FAIL
+  Y_PSF_SIG         : yccd:err # FAIL
+  RA_PSF            : SKIP # astrometry is not calibrated in the cmf
+  DEC_PSF           : SKIP # astrometry is not calibrated in the cmf
+  POSANGLE          : SKIP # astrometry is not calibrated in the cmf
+  PLTSCALE          : SKIP # astrometry is not calibrated in the cmf
+  PSF_INST_MAG      : mag:inst  
+  PSF_INST_MAG_SIG  : mag:err   
+  AP_MAG_STANDARD   : mag:ap # FAIL
+  AP_MAG_RADIUS     : SKIP # no accessor
+  PEAK_FLUX_AS_MAG  : SKIP # no accessor
+  CAL_PSF_MAG       : SKIP # photometry is not calibrated in the cmf
+  CAL_PSF_MAG_SIG   : SKIP # photometry is not calibrated in the cmf
+  SKY               : sky       
+  SKY_SIG           : sky_err   
+  PSF_CHISQ         : psf_chisq 
+  CR_NSIGMA         : cr_nsigma 
+  EXT_NSIGMA        : ext_nsigma
+  PSF_MAJOR         : FWHM_MAJ  
+  PSF_MINOR         : FWHM_MIN  
+  PSF_THETA         : THETA # FAIL
+  PSF_QF            : PSF_QF    
+  PSF_NDOF          : SKIP # no accessor
+  PSF_NPIX          : SKIP # no accessor
+  MOMENTS_XX        : SKIP # no accessor
+  MOMENTS_XY        : SKIP # no accessor
+  MOMENTS_YY        : SKIP # no accessor
+  FLAGS             : phot_flags
+  N_FRAMES          : SKIP # no accessor        
+end