Changeset 4694 for trunk/MagicSoft/Mars/macros/sql

Timestamp:

08/20/04 11:25:36 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/macros/sql

Files:

• filldotrbk.C (modified) (1 diff)
• filldotrun.C (modified) (7 diffs)

trunk/MagicSoft/Mars/macros/sql/filldotrbk.C

@@ -193 +193 @@
         TSQLResult *res = serv.Query(query);
         if (!res)
-        {
-            cout << "ERROR: " << query << endl << endl;
             return 0;
-        }
 
         delete res;

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

@@ -107 +107 @@
     TSQLResult *res = serv.Query(query);
     if (!res)
-    {
-        cout << "ERROR - Query: " << query << endl;
-        return -1;
-    }
+        return -1;
 
     TSQLRow *row=res->Next();
@@ -134 +131 @@
     res=serv.Query(query);
     if (!res)
-    {
-        cout << "ERROR - Query: " << query << endl;
-        return -1;
-    }
+        return -1;
+
     delete res;
 
@@ -157 +152 @@
     if (!fin)
     {
-        cout << "Could not open file " << fname << endl;
+        cout << "Could not open file " << filename << endl;
         return -1;
     }
@@ -379 +374 @@
         if (!TMath::IsNaN(l2uprate) && TMath::Finite(l2uprate))
             query += Form("fL2RateUnpresc=%d, ", TMath::Nint(l2uprate));
-        query += "fMagicNumberKEY=1";
+        query += "fMagicNumberKEY=1, fExcludedFDAKEY=1";
 
         //cout << query << endl;
@@ -393 +388 @@
         TSQLResult *res = serv.Query(query);
         if (!res)
-        {
-            cout << query << " - FAILED!" << endl;
             return -1;
-        }
 
         delete res;
@@ -406 +398 @@
 
 // This tool will work from Period017 (2004_05_17) on...
-void filldotrun(const char *path="/data/MAGIC/Period018/ccdata", Bool_t dummy=kTRUE)
+int filldotrun(const TString path="/data/MAGIC/Period018/ccdata", Bool_t dummy=kTRUE)
 {
     MSQLServer serv("mysql://hercules:d99swMT!@localhost");
@@ -423 +415 @@
     if (path.EndsWith(".run"))
     {
+        cout << path(TRegexp("CC_.*.run", kFALSE)) << flush;
+        Int_t n = insert(serv, dummy, path);
+        cout << " <" << n << "> " << (dummy?"DUMMY":"") << endl;
+
+        return n<0 ? 0 : 1;
+    }
+
+    MDirIter Next(path, "CC_*.run", -1);
+    while (1)
+    {
+        TString name = Next();
+        if (name.IsNull())
+            break;
+
         cout << name(TRegexp("CC_.*.run", kFALSE)) << flush;
         Int_t n = insert(serv, dummy, name);
         cout << " <" << n << "> " << (dummy?"DUMMY":"") << endl;
 
-        return n<0 ? 0 : 1;
-    }
-
-    MDirIter Next(path, "CC_*.run", -1);
-    while (1)
-    {
-        TString name = Next();
-        if (name.IsNull())
-            break;
-
-        cout << name(TRegexp("CC_.*.run", kFALSE)) << flush;
-        Int_t n = insert(serv, dummy, name);
-        cout << " <" << n << "> " << (dummy?"DUMMY":"") << endl;
-
         if (n<0)
             return 0;