Changeset 37472

Timestamp:

Oct 8, 2014, 4:48:09 PM (12 years ago)

Author:

eugene

Message:

fix 2 problems found by optimization

Location:

trunk/Ohana/src

Files:

• addstar/src/loadsupercos_plates.c (modified) (1 diff)
• dvomerge/src/merge_catalogs_new.c (modified) (2 diffs)

trunk/Ohana/src/addstar/src/loadsupercos_plates.c

@@ -92 +92 @@
     image[Nimage].Radius = NAN;
     
-    snprintf (image[Nimage].name, 121, "SCOS.%02d.%06d", survey_id, plate_id);
+    snprintf (image[Nimage].name, DVO_IMAGE_NAME_LEN, "SCOS.%02d.%06d", survey_id, plate_id);
     image[Nimage].imageID = Nimage + 1;
     image[Nimage].externID = plate_id;

trunk/Ohana/src/dvomerge/src/merge_catalogs_new.c

@@ -15 +15 @@
   Naverage = output[0].Naverage;
   Nmeasure = output[0].Nmeasure;
+  Nlensing = output[0].Nlensing;
 
   NsecfiltOut = output[0].Nsecfilt;
@@ -21 +22 @@
   NAVERAGE = Naverage + 100;
   NMEASURE = Nmeasure + 1000;
+  NLENSING = Nlensing + 1000;
 
   REALLOCATE (output[0].average, Average, NAVERAGE);
   REALLOCATE (output[0].secfilt, SecFilt, NAVERAGE*NsecfiltOut);
   REALLOCATE (output[0].measure, Measure, NMEASURE);
+  REALLOCATE (output[0].lensing, Lensing, NLENSING);
 
   // add all of these entries to the existing catalog