Changeset 9191 for trunk/MagicSoft/Mars/datacenter/macros

Timestamp:

12/09/08 15:47:31 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/macros/buildsequenceentries.C (modified) (5 diffs)

trunk/MagicSoft/Mars/datacenter/macros/buildsequenceentries.C

@@ -890 +890 @@
     }
 
-    Int_t SplitBlock(Int_t runstart, Int_t runstop)
+    Int_t SplitBlock(Int_t runstart, Int_t runstop, const TString &cond)
     {
         // Request data necessary to split block into sequences
-        const TString query=
+        /*const*/ TString query=
             Form("SELECT fRunNumber*1000+fFileNumber AS Id, fRunTypeKEY, fRunStart, fRunStop"
                  " FROM RunData "
                  " WHERE fRunNumber*1000+fFileNumber BETWEEN %d AND %d AND "
-                 " fExcludedFDAKEY=1 AND (fRunTypeKEY BETWEEN 2 AND 4)"
-                 " ORDER BY Id", runstart, runstop);
+                 /*" fExcludedFDAKEY=1 AND (fRunTypeKEY BETWEEN 2 AND 4)"
+                  " ORDER BY Id"*/, runstart, runstop);
+
+        query += cond;
+        query += " ORDER BY Id";
+
 
         // Send query
@@ -1001 +1005 @@
     }
 
-    Int_t BuildBlocks(TSQLResult *res, TExMap &blocks)
+    Int_t BuildBlocks(TSQLResult *res, TExMap &blocks, const TString &cond)
     {
         // col key content
@@ -1072 +1076 @@
                 cout << " - Identical conditions from " << runstart << " to " << runstop << endl;
                 blocks.Add((ULong_t)blocks.GetSize(), runstart, runstop);
-                if (SplitBlock(runstart, runstop)==2)
+                if (SplitBlock(runstart, runstop, cond)==2)
                     return 2;
                 cout << " - Transition from " << RunType(keys[1]) << ":";
@@ -1105 +1109 @@
             //fill values into TExMap (last value)
             blocks.Add((ULong_t)blocks.GetSize(), runstart, runstop);
-            if (SplitBlock(runstart, runstop)==2)
+            if (SplitBlock(runstart, runstop, cond)==2)
                 return 2;
         }
@@ -1184 +1188 @@
 
         TExMap blocks;
-        const Int_t rc = BuildBlocks(res, blocks);
+        const Int_t rc = BuildBlocks(res, blocks, cond);
         delete res;