Changeset 8993 for trunk

Timestamp:

07/03/08 16:39:44 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/filldotrun.C (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
      - this made local functions obsolete
      - added new format 20080519 including telescope- and file-number
-     - simplified the if-clauses testing for version numbers (due to the
-       initial check only some version numbers allowed anyway)
+     - simplified the if-clauses testing for version numbers (due to
+       the initial check only some version numbers allowed anyway)
+     - check for the combination of telescope-, run- and file-number 
+       to be unique.
 
 

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

@@ -139 +139 @@
     while (1)
     {
-        Int_t telnumber = 1;
+        Int_t telnumber = 1; // FIXME: "NULL"?
         if (version >=200805190)
         {
@@ -174 +174 @@
         }
 
-        Int_t filenumber = 0;
+        Int_t filenumber = 0; // FIXME: "NULL"?
         if (version >=200805190)
         {
@@ -181 +181 @@
         }
 
-        if (serv.ExistStr("fRunNumber", "RunData", strng))
-        {
-            // FIXME: Maybe we can implement an switch to update mode?
-            cout << "Run #" << runnumber << " already existing... skipped." << endl;
+        TString where = Form("((fTelescopeNumber=%d AND fFileNumber=%d) OR"
+                             "(ISNULL(fTelescopeNumber) AND ISNULL(fFileNumber)))",
+                             telnumber, filenumber);
+        if (serv.ExistStr("fRunNumber", "RunData", strng, where))
+        {
+            // FIXME: Maybe we can implement a switch to update mode?
+            cout << "Entry M" << telnumber << ":" << runnumber << "/" << filenumber << " already existing... skipped." << endl;
             strng.ReadLine(fin);
             continue;