Changeset 7629 for trunk/MagicSoft/Mars/datacenter/macros/buildsequenceentries.C

Timestamp:

04/07/06 14:10:53 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

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

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

@@ -463 +463 @@
                  " fL1TriggerTableKEY, fL2TriggerTableKEY,"
                  " fHvSettingsKEY, fDiscriminatorThresholdTableKEY,"
-                 " fTriggerDelayTableKEY, fLightConditionsKEY, fTestFlagKEY"
+                 " fTriggerDelayTableKEY, fLightConditionsKEY, "
+                 " fTestFlagKEY, fObservationModeKEY "
                  " FROM RunData"
                  " WHERE fRunTypeKEY=2 AND fExcludedFDAKEY=1 AND (fRunNumber BETWEEN %d AND %d)"
@@ -496 +497 @@
     query1+=Form(" fTriggerDelayTableKEY=%s,", (*row)[6]);
     query1+=Form(" fLightConditionsKEY=%s,", (*row)[7]);
-    query1+=Form(" fTestFlagKEY=%s, fManuallyChangedKEY=1", (*row)[8]);
+    query1+=Form(" fTestFlagKEY=%s, ", (*row)[8]);
+    query1+=Form(" fObservationModeKEY=%s, fManuallyChangedKEY=1", (*row)[9]);
 
 
@@ -810 +812 @@
 
     //get all values from the database, that are relevant for building sequences
-    TString query(Form("SELECT fRunNumber, fSourceKEY, fProjectKEY, fHvSettingsKEY,  fLightConditionsKEY, fDiscriminatorThresholdTableKEY, fTriggerDelayTableKEY FROM RunData WHERE %s AND fExcludedFDAKEY=1 order by fRunNumber", cond.Data()));
+    TString query(Form("SELECT fRunNumber, fSourceKEY, fProjectKEY, fHvSettingsKEY,  fLightConditionsKEY, fDiscriminatorThresholdTableKEY, fTriggerDelayTableKEY, fObservationModeKEY FROM RunData WHERE %s AND fExcludedFDAKEY=1 order by fRunNumber", cond.Data()));
 
     TSQLResult *res = serv.Query(query);
@@ -819 +821 @@
     //for each block the first and the last run are stored in a TExMap
     //the values are checked with the help of an array of TStrings
-    TString keys[6]= { "NULL", "NULL", "NULL", "NULL", "NULL", "NULL" };
+    TString keys[7]= { "NULL", "NULL", "NULL", "NULL", "NULL", "NULL" , "NULL" };
     TString stop     = "NULL";
     TString runstart = "NULL";
@@ -833 +835 @@
         if (count==0)
         {
-            for (Int_t i=1 ; i<7 ; i++)
+            for (Int_t i=1 ; i<8 ; i++)
                 keys[i-1]=(*row)[i];
             runstart=(*row)[0];
         }
 
-        for (Int_t i=1 ; i<7 ; i++)
+        for (Int_t i=1 ; i<8 ; i++)
         {
             runbegin=atoi(runstart.Data());
@@ -854 +856 @@
             blocks.Add((ULong_t)blocks.GetSize(), (Long_t)runbegin, (Long_t)runend);
             runstart=(*row)[0];
-            for (Int_t i=1 ; i<7 ; i++)
+            for (Int_t i=1 ; i<8 ; i++)
                 keys[i-1]=(*row)[i];
             break;