Changeset 31160 for trunk/Ohana/src/relastro

Timestamp:

Apr 4, 2011, 1:19:27 PM (15 years ago)

Author:

eugene

Message:

updates from eam branch

Location:

trunk/Ohana/src/relastro

Files:

• include/relastro.h (modified) (2 diffs)
• src/UpdateObjects.c (modified) (1 diff)
• src/args.c (modified) (1 diff)
• src/high_speed_objects.c (modified) (6 diffs)
• src/select_images.c (modified) (4 diffs)

trunk/Ohana/src/relastro/include/relastro.h

@@ -89 +89 @@
 char   GSCFILE[256];
 char   CATDIR[256];
+char   *HIGH_SPEED_DIR;
 char   CATMODE[16];    /* raw, mef, split, mysql */
 char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
@@ -95 +96 @@
 
 double SIGMA_LIM;
-int    SRC_MEAS_TOOFEW; //catalog objects wich fewer detections then this are ignored
+int SRC_MEAS_TOOFEW; //catalog objects wich fewer detections then this are ignored
 double MIN_ERROR;
 

trunk/Ohana/src/relastro/src/UpdateObjects.c

@@ -92 +92 @@
       }
 # endif
+
+      if (catalog[i].average[j].Nmeasure == 0) {
+          continue;
+      }
 
       N = 0;

trunk/Ohana/src/relastro/src/args.c

@@ -39 +39 @@
     remove_argument (N, &argc, argv);
     RADIUS = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+    HIGH_SPEED_DIR = strcreate(argv[N]);
     remove_argument (N, &argc, argv);
   }

trunk/Ohana/src/relastro/src/high_speed_objects.c

@@ -22 +22 @@
   int zcode, zNsec, ycode, yNsec, jcode, jNsec, hcode, hNsec, kcode, kNsec, USNO_R, USNO_N, Nsecfilt;
   char filename[1024];
-  char outdir[]="/data/ipp022.0/ndeacon/hispeedzy";
   Noff = strlen(CATDIR);
-  sprintf (filename, "%s/%s", outdir, &catalog[0].filename[Noff]);
+  sprintf (filename, "%s/%s", HIGH_SPEED_DIR, &catalog[0].filename[Noff]);
+  printf("%s\n",filename);
   dvo_catalog_init(&catalog1, TRUE); /*initialise new catalogue*/
   catalog1.filename = strcreate(filename);
@@ -121 +121 @@
     foundA = FALSE;
     for (j = 0; !foundA && (j < catalog[0].average[i].Nmeasure); j++, m++) {
-      if((catalog[0].average[i].R>204.1923)&&(catalog[0].average[i].R<204.1924)&&(catalog[0].average[i].D>11.376)&&(catalog[0].average[i].D<11.377))
-        {
-          printf("Hello");
-        }
 
       if (MeasMatchesPhotcode(&catalog[0].measure[m], photcodesGroupA, NphotcodesGroupA)) {
@@ -135 +131 @@
     foundB = FALSE;
     for (j = 0; !foundB && (j < catalog[0].average[i].Nmeasure); j++, m++) {
-                                                   
-      if((catalog[0].average[i].R>204.192)&&(catalog[0].average[i].R<204.1925)&&(catalog[0].average[i].D>11.376)&&(catalog[0].average[i].D<11.377))
-        {
-          printf("Hello");
-        }
+          
 
       if (MeasMatchesPhotcode(&catalog[0].measure[m], photcodesGroupB, NphotcodesGroupB)) {
@@ -158 +150 @@
     if (foundA && !foundB) {
       // average-based tests:
-                                                   
-      if((catalog[0].average[i].R>204.1923)&&(catalog[0].average[i].R<204.1924)&&(catalog[0].average[i].D>11.376)&&(catalog[0].average[i].D<11.377))
-        {
-          printf("Hello");
-        }
+         
 
       valid = TRUE;
@@ -204 +192 @@
 
       // average-based tests:
-      if((catalog[0].average[i].R>204.192)&&(catalog[0].average[i].R<204.193)&&(catalog[0].average[i].D>11.372)&&(catalog[0].average[i].D<11.373))
-        {
-          printf("Hello");
-        }
       valid = TRUE;
       valid &= ((catalog[0].average[i].flags & 0x01000000) == 0);
@@ -214 +198 @@
 
       valid &= ((catalog[0].secfilt[i*Nsecfilt + jNsec].M < 1.0)||(isnan(catalog[0].secfilt[i*Nsecfilt + jNsec].M)));
-      valid &= (catalog[0].secfilt[i*Nsecfilt + yNsec].Nused > 1);
-      valid &= (catalog[0].secfilt[i*Nsecfilt + yNsec].dM < 0.2);
+      valid &= ((catalog[0].secfilt[i*Nsecfilt + yNsec].Nused > 1)||(catalog[0].secfilt[i*Nsecfilt + zNsec].Nused > 1));
+      valid &= ((catalog[0].secfilt[i*Nsecfilt + yNsec].dM < 0.2)||(catalog[0].secfilt[i*Nsecfilt + zNsec].dM < 0.2));
 
       /*if ((catalog[0].secfilt[i*Nsecfilt + zNsec].M < 1.0) || (catalog[0].secfilt[i*Nsecfilt + zNsec].Nused == 1)) {

trunk/Ohana/src/relastro/src/select_images.c

@@ -144 +144 @@
     }
     
+    // this adds 1.3 sec for 3M images
     if (!FindMosaicForImage (timage, Ntimage, i)) {
-      fprintf (stderr, "cannot find mosaic for "OFF_T_FMT"\n",  i);
+      fprintf (stderr, "cannot find mosaic for "OFF_T_FMT"\n", i);
       continue;
     }
@@ -165 +166 @@
     found = FALSE;
 
-    /* transform corners to ra,dec */
+    /* transform corners to ra,dec -- costs ~3sec for 3M images (pikake) */
     double RminImage = 360.0;
     double RmaxImage =   0.0;
     double DminImage = +90.0;
     double DmaxImage = -90.0;
-    // int leftside = FALSE;
     for (j = 0; j < 5; j++) {
       XY_to_RD (&Ri[j], &Di[j], Xi[j], Yi[j], &timage[i].coords);
@@ -197 +197 @@
     if (USE_BASIC_CHECK) goto found_it;
 
-    // RA(nStart) is guaranteed to be < RminImage:
+    // RA(nStart) is guaranteed to be < RminImage: -- costs 0.5sec for 3M images
     nStart = getRegionStartByRA (RminImage, RmaxSky, skylist[0].Nregions);
 
@@ -258 +258 @@
   }
   MARKTIME("finish image selection: %f sec\n", dtime);
-    
-  if (VERBOSE) fprintf (stderr, "found "OFF_T_FMT" images\n",  nimage);
+
+  if (VERBOSE) fprintf (stderr, "found "OFF_T_FMT" images\n", nimage);
 
   REALLOCATE (image, Image, MAX (nimage, 1));