Changeset 35599

Timestamp:

May 27, 2013, 2:31:32 PM (13 years ago)

Author:

eugene

Message:

better srand init for mkcmf; raise errors on nan airmasses; replace KiiOpen,KiiClose with KapaOpen,KapaClose; add -quick-airmass to test script

Location:

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

Files:

• src/SEDops.c (modified) (2 diffs)
• src/airmass.c (modified) (2 diffs)
• src/mkcmf.c (modified) (3 diffs)
• test/relphot.dvo (modified) (2 diffs)

branches/eam_branches/ipp-20130509/Ohana/src/addstar/src/SEDops.c

@@ -86 +86 @@
 int SEDfitInit (SEDtable *table) {
 
-  Xgraph = KiiOpen ("kapa", "sedstar");
+  Xgraph = KapaOpen ("kapa", "sedstar");
   KapaInitGraph (&graphdata);
   SetLimitsRaw (table[0].wavecode, NULL, table[0].Nfilter, &graphdata);
@@ -114 +114 @@
   free (fitmags);
   free (fiterrs);
-  KiiClose (Xgraph);
+  KapaClose (Xgraph);
   return (TRUE);
 }

branches/eam_branches/ipp-20130509/Ohana/src/addstar/src/airmass.c

@@ -6 +6 @@
   AirmassQuality = quality;
 }
+
+static int Nbad_airmass = 0;
 
 float airmass (float secz_image, double ra, double dec, double st, double latitude) {
@@ -23 +25 @@
   cosz = sin (rdec) * sin (rlat) + cos (rdec) * cos (RAD_DEG*hour) * cos (rlat);
   secz = 1.000 / cosz;
+  
+  if (!isfinite(secz)) {
+    Nbad_airmass ++;
+  }
+  if (Nbad_airmass > 1) {
+    fprintf (stderr, "*** WARNING *** NaN airmass for detection\n");
+    fprintf (stderr, "*** ra, dec : %f, %f | st : %f | lat : %f | cosz : %f\n", ra, dec, st, latitude, cosz);
+  }
+  if (Nbad_airmass > 10) {
+    fprintf (stderr, "*** ERROR *** more than 10 NaN airmass values for detections, giving up\n");
+    fprintf (stderr, " (use -quick-airmass to use image airmass)\n");
+    exit (2);
+  }
+
   return (secz);
 }

branches/eam_branches/ipp-20130509/Ohana/src/addstar/src/mkcmf.c

@@ -184 +184 @@
   }
 
+  // init the random seed
+  { 
+    struct timeval now;
+    gettimeofday (&now, NULL);
+    long A = now.tv_sec + now.tv_usec * 1000000;
+    srand48(A);
+  }
+    
   /* bore site center guess */
   strcpy (coords.ctype, "DEC--TAN");
@@ -379 +387 @@
  
   int i;
-  long A, B;
   double val, x, dx, dx1, dx2, dx3, df;
   double mean, sigma;
@@ -386 +393 @@
   if (Ngaussint == Nbin) return;
 
-  A = time(NULL);
-  // XXX this is expensive if called a lot (1 sec min)
-  // for (B = 0; A == time(NULL); B++);
-  B = A + 10000;
-  srand48(B);
+  // A = time(NULL);
+  // // XXX this is expensive if called a lot (1 sec min)
+  // // for (B = 0; A == time(NULL); B++);
+  // B = A + 10000;
+  // srand48(B);
  
   Ngaussint = Nbin;

branches/eam_branches/ipp-20130509/Ohana/src/addstar/test/relphot.dvo

@@ -38 +38 @@
     mkinput $offset:$i
     exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time $i\: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
   end
 
+  echo relphot -D CATDIR catdir.test r -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -update -nloop 10.0
   exec relphot -D CATDIR catdir.test r -region {$RA-1.0} {$RA+1.0} {$DEC-1.0} {$DEC+1.0} -update -nloop 10.0 >& /dev/null
 
@@ -52 +53 @@
   end
 
-  exec rm test.cmf test.in.txt
-  exec rm -r catdir.test
+  #exec rm test.cmf test.in.txt
+  #exec rm -r catdir.test
 
   tapDONE