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

Timestamp:

12/19/08 15:56:10 (16 years ago)

Author:

hoehne

Message:

*** empty log message ***

File:

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

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

@@ -41 +41 @@
 //   060330-0, 060401-0, 060808-0
 //   070416-0,
-//   080220-0, 080519-0, 080912-0
+//   080220-0, 080519-0, 080912-0, 081204-0
 //
 // Usage:
@@ -123 +123 @@
         version!=200603300 && version!=200604010 && version!=200608080 &&
         version!=200704160 &&
-        version!=200802200 && version!=200805190 && version!=200809120)
+        version!=200802200 && version!=200805190 && version!=200809120 &&
+        version!=200812040)
     {
         cout << filename << ": File Version unknown - please update the macro!" << endl;
@@ -537 +538 @@
                 strng.ReadToDelim(fin, ' ');
             }
+            if (version<=200809120)
+                strng.ReadToDelim(fin, '\n');
+            else
+                strng.ReadToDelim(fin, ' ');
+        }
+
+        Int_t sumtriggerflagkey=1;
+        if (version>=200812040)
+        {
+            // ========= Col 52: SumTrigger flag =========
             strng.ReadToDelim(fin, '\n');
+            if (strng.Contains("???"))
+                strng="n/a";
+
+            sumtriggerflagkey = serv.QueryKeyOfName("SumTriggerFlag", strng);
+            if (sumtriggerflagkey<0)
+            {
+                strng.ReadLine(fin);
+                continue;
+            }
+
         }
 
@@ -545 +566 @@
         // ================================================================
 
-        //assemlbe the query that is needed to insert the values of this run
+        //assemble the query that is needed to insert the values of this run
         TString query;
         query += Form("fTelescopeNumber=%d, ", telnumber);
@@ -555 +576 @@
         query += Form("fNumEvents=%d, ",       evtno);
         query += Form("fRunStart=\"%s %s\", ", startdate.Data(), starttime.Data());
-        query += Form("fRunStop=\"%s %s\", ", stopdate.Data(), stoptime.Data());
-        query += Form("fL1TriggerTableKEY=%d, ", l1triggerkey);
-        query += Form("fL2TriggerTableKEY=%d, ", l2triggerkey);
-        query += Form("fTestFlagKEY=%d, ", testflagkey);
+        query += Form("fRunStop=\"%s %s\", ",  stopdate.Data(),  stoptime.Data());
+        query += Form("fL1TriggerTableKEY=%d, ",    l1triggerkey);
+        query += Form("fL2TriggerTableKEY=%d, ",    l2triggerkey);
+        query += Form("fTestFlagKEY=%d, ",          testflagkey);
         query += Form("fCalibrationScriptKEY=%d, ", calibrationscriptkey);
         query += Form("fTriggerDelayTableKEY=%d, ", triggerdelaytablekey);
         query += Form("fDiscriminatorThresholdTableKEY=%d, ", dttablekey);
-        query += Form("fLightConditionsKEY=%d, ", lightcondkey);
-        query += Form("fHvSettingsKEY=%d, ", hvkey);
-        query += Form("fObservationModeKEY=%d, ", observationmodekey);
+        query += Form("fLightConditionsKEY=%d, ",   lightcondkey);
+        query += Form("fHvSettingsKEY=%d, ",        hvkey);
+        query += Form("fObservationModeKEY=%d, ",   observationmodekey);
+        query += Form("fSumTriggerFlagKEY=%d, ",    sumtriggerflagkey);
         if (!TMath::IsNaN(zd) && TMath::Finite(zd))
             query += Form("fZenithDistance=%d, ", TMath::Nint(zd));