Changeset 35594 for branches/eam_branches/ipp-20130509/Ohana/src/dvopsps/src/DetectionOps.c

Timestamp:

May 24, 2013, 1:37:30 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/dvopsps/src/DetectionOps.c (modified) (8 diffs)

branches/eam_branches/ipp-20130509/Ohana/src/dvopsps/src/DetectionOps.c

@@ -54 +54 @@
   GET_COLUMN(ippObjID    , "ippObjID",    int64_t);
   GET_COLUMN(objID       , "objID",       int64_t);
+  GET_COLUMN(photcode    , "photcode",    int);
   GET_COLUMN(flags       , "flags",       int);
   GET_COLUMN(zp          , "zp",          float);
@@ -73 +74 @@
     detections[i].ippObjID     = ippObjID[i];   
     detections[i].objID        = objID[i];      
+    detections[i].photcode     = photcode[i];      
     detections[i].flags        = flags[i];      
     detections[i].zp           = zp[i];         
@@ -90 +92 @@
   free (ippObjID   );
   free (objID      );
+  free (photcode   );
   free (flags      );
   free (zp         );
@@ -154 +157 @@
   // gfits_define_bintable_column (&theader, "K", "ippObjID",    NULL, NULL, 1.0, BZERO_INT64);
   // gfits_define_bintable_column (&theader, "K", "objID",       NULL, NULL, 1.0, BZERO_INT64);
+  gfits_define_bintable_column (&theader, "J", "photcode",    NULL, NULL, 1.0, 0.0);
   gfits_define_bintable_column (&theader, "J", "flags",       NULL, NULL, 1.0, BZERO_INT32);
   gfits_define_bintable_column (&theader, "E", "zp",          NULL, NULL, 1.0, 0.0);
@@ -173 +177 @@
   uint64_t   *ippObjID    ; ALLOCATE (ippObjID    ,  uint64_t, Ndetections);
   uint64_t   *objID       ; ALLOCATE (objID       ,  uint64_t, Ndetections);
+  int        *photcode    ; ALLOCATE (photcode    ,  int,      Ndetections);
   uint32_t   *flags       ; ALLOCATE (flags       ,  uint32_t, Ndetections);
   float      *zp          ; ALLOCATE (zp          ,  float,    Ndetections);
@@ -190 +195 @@
     ippObjID[i]    = detections[i].ippObjID    ;
     objID[i]       = detections[i].objID       ;
+    photcode[i]    = detections[i].photcode    ;
     flags[i]       = detections[i].flags       ;
     zp[i]          = detections[i].zp          ;
@@ -207 +213 @@
   gfits_set_bintable_column (&theader, &ftable, "ippObjID",    ippObjID    , Ndetections);
   gfits_set_bintable_column (&theader, &ftable, "objID",       objID       , Ndetections);
+  gfits_set_bintable_column (&theader, &ftable, "photcode",    photcode    , Ndetections);
   gfits_set_bintable_column (&theader, &ftable, "flags",       flags       , Ndetections);
   gfits_set_bintable_column (&theader, &ftable, "zp",          zp          , Ndetections);
@@ -222 +229 @@
   free (ippObjID    );
   free (objID       );
+  free (photcode    );
   free (flags       );
   free (zp          );