Changeset 40230

Timestamp:

Nov 30, 2017, 8:44:49 PM (9 years ago)

Author:

eugene

Message:

need to have a test-mode to skip gpc1-specific restrictions

Location:

branches/eam_branches/ohana.20170822/src/dvopsps

Files:

• include/dvopsps.h (modified) (1 diff)
• src/initialize_dvopsps.c (modified) (2 diffs)
• src/insert_FWobjects_dvopsps.c (modified) (1 diff)
• src/insert_FWobjects_dvopsps_catalog.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/dvopsps/include/dvopsps.h

@@ -45 +45 @@
 
 int          SAVE_REMOTE;
+int          TEST_MODE;
 
 int          PARALLEL;

branches/eam_branches/ohana.20170822/src/dvopsps/src/initialize_dvopsps.c

@@ -123 +123 @@
   if ((N = get_argument (argc, argv, "-insert-remote"))) {
     SAVE_REMOTE = FALSE;
+    remove_argument (N, &argc, argv);
+  }
+
+  TEST_MODE = FALSE;
+  if ((N = get_argument (argc, argv, "-test-mode"))) {
+    TEST_MODE = TRUE;
     remove_argument (N, &argc, argv);
   }
@@ -361 +367 @@
   }
 
+  TEST_MODE = FALSE;
+  if ((N = get_argument (argc, argv, "-test-mode"))) {
+    TEST_MODE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
   HOST_ID = 0;
   if ((N = get_argument (argc, argv, "-hostID"))) {

branches/eam_branches/ohana.20170822/src/dvopsps/src/insert_FWobjects_dvopsps.c

@@ -136 +136 @@
     snprintf (tmpline, 1024, "%s -dbname %s", command, DATABASE_NAME); strcpy (command, tmpline);
 
-    if (VERBOSE)    { snprintf (tmpline, 1024, "%s -v",      command);             strcpy (command, tmpline); }
-    if (SINGLE_CPT) { snprintf (tmpline, 1024, "%s -cpt %s", command, SINGLE_CPT); strcpy (command, tmpline); }
+    if (VERBOSE)    { snprintf (tmpline, 1024, "%s -v",         command);             strcpy (command, tmpline); }
+    if (TEST_MODE)  { snprintf (tmpline, 1024, "%s -test-mode", command);             strcpy (command, tmpline); }
+    if (SINGLE_CPT) { snprintf (tmpline, 1024, "%s -cpt %s",    command, SINGLE_CPT); strcpy (command, tmpline); }
 
     fprintf (stderr, "command: %s\n", command);

branches/eam_branches/ohana.20170822/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c

@@ -43 +43 @@
     }
 
-    int hasPS1 = FALSE;
-    for (int j = 0; !hasPS1 && (j < Nsecfilt); j++) {
-      if (secfilt[i*Nsecfilt + j].flags & hasPS1_flag) hasPS1 = TRUE;
-    }
-    if (!hasPS1) continue; // skip non-PS1 data
+    if (!TEST_MODE) {
+      int hasPS1 = FALSE;
+      for (int j = 0; !hasPS1 && (j < Nsecfilt); j++) {
+        if (secfilt[i*Nsecfilt + j].flags & hasPS1_flag) hasPS1 = TRUE;
+      }
+      if (!hasPS1) continue; // skip non-PS1 data
+    }
 
     off_t m = average[i].lensobjOffset;