Changeset 40157

Timestamp:

Oct 11, 2017, 9:50:26 AM (9 years ago)

Author:

eugene

Message:

minor changes

Location:

branches/eam_branches/ohana.20170809/src

Files:

• dvopsps/src/insert_detections_dvopsps_catalog.c (modified) (1 diff)
• kapa2/src/DrawObjects.c (modified) (2 diffs)
• libohana/src/ohana_allocate.c (modified) (3 diffs)

branches/eam_branches/ohana.20170809/src/dvopsps/src/insert_detections_dvopsps_catalog.c

@@ -70 +70 @@
 
 //if (!DetectionsSave (RESULT_FILE, detections, Ndetections)) {
-  if (!DetectionsSave ("/data/ipp110.0/eugene/3pi.dvo.catdirs/3pi.pv3.20170216/catdir.037/dvopsps.09762.24244.det.dat", detections, Ndetections)) {
+//if (!DetectionsSave ("/data/ipp110.0/eugene/3pi.dvo.catdirs/3pi.pv3.20170216/catdir.037/dvopsps.09762.24244.det.dat", detections, Ndetections)) {
+  if (!DetectionsSave ("data/ipp110.0/eugene/3pi.dvo.catdirs/3pi.pv3.20170216/catdir.037/dvopsps.09762.24244.det.dat", detections, Ndetections)) {
     fprintf (stderr, "failed to save detection file %s\n", RESULT_FILE);
     status = FALSE;

branches/eam_branches/ohana.20170809/src/kapa2/src/DrawObjects.c

@@ -522 +522 @@
     // coordinate on the screen of the point:
     double sx1r = x[i]*mxi + y[i]*mxj + bx + XCENTER;
-    double sy1r = x[i]*myi + y[i]*myj + by + YCENTER;
+    // double sy1r = x[i]*myi + y[i]*myj + by + YCENTER;
 
     if (sx1r < X0) {
@@ -605 +605 @@
     n = goodPoint[i + 1];
     double sx2r = x[n]*mxi + y[n]*mxj + bx + XCENTER;
-    double sy2r = x[n]*myi + y[n]*myj + by + YCENTER;
+    // double sy2r = x[n]*myi + y[n]*myj + by + YCENTER;
 
     n = goodPoint[i - 1];
     double sx0r = x[n]*mxi + y[n]*mxj + bx + XCENTER;
-    double sy0r = x[n]*myi + y[n]*myj + by + YCENTER;
+    // double sy0r = x[n]*myi + y[n]*myj + by + YCENTER;
 
     double dx = 0.5*0.5*object->size*(sx2r - sx0r); // 2 factors of 0.5 (we want half of the average spacing)

branches/eam_branches/ohana.20170809/src/libohana/src/ohana_allocate.c

@@ -55 +55 @@
   size_t size;                // total number of bytes requested (not items)
 
-  fprintf (stderr, "malloc: lastBlock: 0x%08lx, Nblock %d, Nelem: %zd, esize: %zd, (%s@%d : %s)\n", (long int) lastBlock, Nblock, Nelem, esize, file, line, func);
+  // fprintf (stderr, "malloc: lastBlock: 0x%08lx, Nblock %d, Nelem: %zd, esize: %zd, (%s@%d : %s)\n", (long int) lastBlock, Nblock, Nelem, esize, file, line, func);
 
   Nelem = MAX (1, Nelem);
@@ -143 +143 @@
   size_t size;
 
-  fprintf (stderr, "realloc: lastBlock: 0x%08lx, Nblock %d, Nelem: %zd, esize: %zd, (%s@%d : %s)\n", (long int) lastBlock, Nblock, Nelem, esize, file, line, func);
+  // fprintf (stderr, "realloc: lastBlock: 0x%08lx, Nblock %d, Nelem: %zd, esize: %zd, (%s@%d : %s)\n", (long int) lastBlock, Nblock, Nelem, esize, file, line, func);
 
   // just allocate if not previously allocated
@@ -257 +257 @@
   OhanaMemblock *ref;
 
-  fprintf (stderr, "free: lastBlock: 0x%08lx, Nblock %d, freeBlock: 0x%08lx, (%s@%d : %s)\n", (long int) lastBlock, Nblock, (long int) in, file, line, func);
+  // fprintf (stderr, "free: lastBlock: 0x%08lx, Nblock %d, freeBlock: 0x%08lx, (%s@%d : %s)\n", (long int) lastBlock, Nblock, (long int) in, file, line, func);
 
   if (!in) return;