Changeset 38740

Timestamp:

Sep 16, 2015, 7:44:41 AM (11 years ago)

Author:

eugene

Message:

adding galphot-ps1-v5-r0 to handle some dbs generated with an early version of galphot

Location:

branches/eam_branches/ipp-20150625/Ohana/src

Files:

• libautocode/Makefile.Targets (modified) (2 diffs)
• libautocode/def/galphot-ps1-v5-r0.d (added)
• libautocode/def/galphot-ps1-v5-r1.d (added)
• libdvo/include/ps1_v5_defs.h (modified) (1 diff)
• libdvo/src/dvo_convert.c (modified) (3 diffs)
• libdvo/src/dvo_convert_PS1_V5.c (modified) (2 diffs)

branches/eam_branches/ipp-20150625/Ohana/src/libautocode/Makefile.Targets

@@ -56 +56 @@
 $(ASRC)/starpar-ps1-sim.$(ARCH).o \
 $(ASRC)/galphot.$(ARCH).o \
-$(ASRC)/galphot-ps1-v5.$(ARCH).o \
+$(ASRC)/galphot-ps1-v5-r0.$(ARCH).o \
+$(ASRC)/galphot-ps1-v5-r1.$(ARCH).o \
 $(ASRC)/missing.$(ARCH).o \
 $(ASRC)/photcode.$(ARCH).o \
@@ -168 +169 @@
 $(AINC)/starpar-ps1-sim.h \
 $(AINC)/galphot.h \
-$(AINC)/galphot-ps1-v5.h \
+$(AINC)/galphot-ps1-v5-r0.h \
+$(AINC)/galphot-ps1-v5-r1.h \
 $(AINC)/missing.h \
 $(AINC)/photcode.h \

branches/eam_branches/ipp-20150625/Ohana/src/libdvo/include/ps1_v5_defs.h

@@ -23 +23 @@
 StarPar_PS1_V5          *StarParInternalTo_PS1_V5 (StarPar *in, off_t Nvalues);
 
-GalPhot                 *GalPhot_PS1_V5_ToInternal (GalPhot_PS1_V5 *in, off_t Nvalues);
-GalPhot_PS1_V5         *GalPhotInternalTo_PS1_V5 (GalPhot *in, off_t Nvalues);
+GalPhot                 *GalPhot_PS1_V5_R1_ToInternal (GalPhot_PS1_V5_R1 *in, off_t Nvalues);
+GalPhot                 *GalPhot_PS1_V5_R0_ToInternal (GalPhot_PS1_V5_R0 *in, off_t Nvalues);
+
+GalPhot_PS1_V5_R1       *GalPhotInternalTo_PS1_V5_R1 (GalPhot *in, off_t Nvalues);
 
 PhotCode                *PhotCode_PS1_V5_To_Internal (PhotCode_PS1_V5 *in, off_t Nvalues);

branches/eam_branches/ipp-20150625/Ohana/src/libdvo/src/dvo_convert.c

@@ -884 +884 @@
   }
 
+  if (!strcmp (extname, "DVO_GALPHOT_PS1_V5") && (ftable[0].header[0].Naxis[0] == 72)) {
+    GalPhot_PS1_V5_R0 *tmpGalPhot;                                              
+    tmpGalPhot = gfits_table_get_GalPhot_PS1_V5_R0 (ftable, Ngalphot, NULL, &nativeBytes); 
+    if (!tmpGalPhot) {                                                  
+      fprintf (stderr, "ERROR: failed to read galphots\n");             
+      exit (2);                                                         
+    }                                                                   
+    galphot = GalPhot_PS1_V5_R0_ToInternal (tmpGalPhot, *Ngalphot); 
+    free (tmpGalPhot);                                                  
+    ftable[0].buffer = NULL;
+    *format = DVO_FORMAT_PS1_V5;                                        
+    return (galphot); 
+  }
+
 # define SKIPPING_FORMAT(NAME, FORMAT, TYPE)                            \
   if (!strcmp (extname, NAME)) {                                        \
@@ -926 +940 @@
   SKIPPING_FORMAT ("DVO_GALPHOT_PS1_V3",          PS1_V3,          PS1_V3);
   SKIPPING_FORMAT ("DVO_GALPHOT_PS1_V4",          PS1_V4,          PS1_V4);
-  CONVERT_FORMAT  ("DVO_GALPHOT_PS1_V5",          PS1_V5,          PS1_V5);
+  CONVERT_FORMAT  ("DVO_GALPHOT_PS1_V5",          PS1_V5,          PS1_V5_R1);
   SKIPPING_FORMAT ("DVO_GALPHOT_PS1_SIM",         PS1_SIM,         PS1_SIM);
 # undef CONVERT_FORMAT
@@ -965 +979 @@
 //    FORMAT_CASE (PS1_V3,          PS1_V3);
 //    FORMAT_CASE (PS1_V4,          PS1_V4);
-      FORMAT_CASE (PS1_V5,          PS1_V5);
+      FORMAT_CASE (PS1_V5,          PS1_V5_R1);
 # undef FORMAT_CASE
 

branches/eam_branches/ipp-20150625/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

@@ -983 +983 @@
 }
 
-GalPhot *GalPhot_PS1_V5_ToInternal (GalPhot_PS1_V5 *in, off_t Nvalues) {
+GalPhot *GalPhot_PS1_V5_R1_ToInternal (GalPhot_PS1_V5_R1 *in, off_t Nvalues) {
 
   off_t i;
@@ -1017 +1017 @@
 }
 
-GalPhot_PS1_V5 *GalPhotInternalTo_PS1_V5 (GalPhot *in, off_t Nvalues) {
-
-  off_t i;
-  GalPhot_PS1_V5 *out;
-
-  ALLOCATE_ZERO (out, GalPhot_PS1_V5, Nvalues);
+GalPhot *GalPhot_PS1_V5_R0_ToInternal (GalPhot_PS1_V5_R0 *in, off_t Nvalues) {
+
+  off_t i;
+  GalPhot *out;
+
+  ALLOCATE_ZERO (out, GalPhot, Nvalues);
+
+  for (i = 0; i < Nvalues; i++) {
+    dvo_galphot_init (&out[i]);
+
+    out[i].Xfit          = in[i].Xfit;
+    out[i].Yfit          = in[i].Yfit;
+    out[i].mag           = in[i].mag;
+    out[i].magErr        = in[i].magErr;
+    out[i].majorAxis     = in[i].majorAxis;
+    out[i].minorAxis     = in[i].minorAxis;
+    out[i].majorAxisErr  = in[i].majorAxisErr;
+    out[i].minorAxisErr  = in[i].minorAxisErr;
+    out[i].theta         = in[i].theta;
+    out[i].thetaErr      = in[i].thetaErr;
+    out[i].index         = in[i].index;
+    out[i].chisq         = in[i].chisq;
+    out[i].Npix          = in[i].Npix;
+    out[i].objID         = in[i].objID;
+    out[i].catID         = in[i].catID;
+    out[i].detID         = in[i].detID;
+    out[i].imageID       = in[i].imageID;
+//  out[i].averef        = in[i].averef;
+    out[i].photcode      = in[i].photcode;
+    out[i].modelType     = in[i].modelType;
+  }
+  return (out);
+}
+
+GalPhot_PS1_V5_R1 *GalPhotInternalTo_PS1_V5_R1 (GalPhot *in, off_t Nvalues) {
+
+  off_t i;
+  GalPhot_PS1_V5_R1 *out;
+
+  ALLOCATE_ZERO (out, GalPhot_PS1_V5_R1, Nvalues);
 
   for (i = 0; i < Nvalues; i++) {