Changeset 18308 for trunk/Mars/fact

Timestamp:

08/31/15 00:37:40 (9 years ago)

Author:

Daniela Dorner

Message:

bugfix (start and stop in regular expressions of sequences.rc were ignored)

File:

• trunk/Mars/fact/processing/buildseqentries.C (modified) (8 diffs)

trunk/Mars/fact/processing/buildseqentries.C

@@ -136 +136 @@
         if (arr.GetEntries()>2)
             fMax = GetId(arr[2]->GetName());
+        cout << "----> " << fMin << " " << fMax << endl;
     }
 
@@ -217 +218 @@
         if (run>0)
         {
+            cout << " - - > " << run << endl;
             if (run<fMin || run>fMax)
                 return kFALSE;
@@ -915 +917 @@
     }
 
-    TString PrepareString(TSQLResult &res, TArrayL &runs)
+    TString PrepareString(TSQLResult &res, TArrayL &runs, TArrayL &nights)
     {
         // Number of result rows
@@ -921 +923 @@
 
         runs.Set(rows);       // initialize size of array for run numbers
+        nights.Set(rows);       // initialize size of array for nights
 
         TArrayD start(rows);  // instantiate array for start times
@@ -932 +935 @@
         {
             runs[idx] = atol((*row)[0]);          // run number
+            nights[idx] = atol((*row)[4]);          // night
 
             const TString tstart = ((*row)[2]);   // start time
@@ -1021 +1025 @@
         /*const*/
         TString query =
-            "SELECT fRunID, fRunTypeKEY, fRunStart, fRunStop"
+            "SELECT fRunID, fRunTypeKEY, fRunStart, fRunStop, fNight*1000 "
             " FROM RunInfo WHERE fExcludedFDAKEY=1 AND ";
         query += Form("fRunID BETWEEN %ld AND %ld AND "
@@ -1038 +1042 @@
         // and an array with the corresponding run-numbers
         TArrayL runs;
-        const TString str = PrepareString(*res, runs);
+        TArrayL nights;
+        const TString str = PrepareString(*res, runs, nights);
 
         delete res;
@@ -1071 +1076 @@
             {
                 // Check if regular expressions matchs
-                const Ssiz_t len = obj->Match(str, pos, runs[pos]);
+                const Ssiz_t len = obj->Match(str, pos, nights[pos]);
                 if (len>0)
                 {