Changeset 7400 for trunk/MagicSoft/Mars

Timestamp:

11/14/05 14:34:24 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/insertsequence.C (modified) (7 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/11/14 Daniela Dorner
+
+   * datacenter/macros/insertsequence.C:
+     - added possibility to set source name in sequence file
+
+
 
  2005/11/14 Thomas Bretz

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

@@ -84 +84 @@
     if (dummy)
     {
-        cout << query << endl;
+        cout << "Q:" << query << endl;
         return 0;
     }
@@ -90 +90 @@
     res=serv.Query(query);
     if (!res)
+    {
+        cout << "Error in query " << query << endl;
         return -1;
+    }
 
     delete res;
@@ -122 +125 @@
     cout << endl;
 
-    TString sequnum=filename;
-    sequnum=sequnum.Remove(0,30);
-    sequnum=sequnum.Remove(8);
+    TString sequnum;
+    sequnum=sequ.GetValue("Sequence", "");
     Int_t seq=atoi(sequnum.Data());
 
@@ -135 +137 @@
         return 0;
     }
+
+    TString sourcename = sequ.GetValue("Source", "");
+    Int_t sourcekey = QueryNameKEY(serv, dummy, "Source", sourcename.Data());
 
     TString query="SELECT max(fRunNumber), min(fRunStart), ";
@@ -143 +148 @@
 
     cout << "runs: " << runs << endl;
-    cout << "q: " << query << endl;
+    cout << "q1: " << query << endl;
 
     TSQLResult *res = serv.Query(query);
@@ -166 +171 @@
     query +=Form("fL2TriggerTableKEY FROM RunData WHERE fRunNumber=%d", seq);
 
-    cout << "q: " << query << endl;
+    cout << "q2: " << query << endl;
 
     res = serv.Query(query);
@@ -185 +190 @@
     delete res;
 
-    cout << "seq: "       << seq       << endl;
-    cout << " lastrun   " << lastrun   << endl;
-    cout << " startime  " << starttime << endl;
-    cout << " uptime    " << uptime    << endl;
-    cout << " zdmin     " << zdmin     << endl;
-    cout << " zdmax     " << zdmax     << endl;
-    cout << " azmin     " << azmin     << endl;
-    cout << " azmax     " << azmax     << endl;
-    cout << " numevts   " << numevts   << endl;
-    cout << " keys:"                   <<  endl;
-    cout << " project   " << project   << endl;
-    cout << " source    " << source    << endl;
-    cout << " hv        " << hv        << endl;
-    cout << " delay     " << delay     << endl;
-    cout << " dt        " << dt        << endl;
-    cout << " testflag  " << testflag  << endl;
-    cout << " lightcond " << lightcond << endl;
-    cout << " l1tt      " << l1tt      << endl;
-    cout << " l2tt      " << l2tt      << endl;
+    cout << "seq: "       << seq        << endl;
+    cout << "  lastrun   " << lastrun   << endl;
+    cout << "  startime  " << starttime << endl;
+    cout << "  uptime    " << uptime    << endl;
+    cout << "  zdmin     " << zdmin     << endl;
+    cout << "  zdmax     " << zdmax     << endl;
+    cout << "  azmin     " << azmin     << endl;
+    cout << "  azmax     " << azmax     << endl;
+    cout << "  numevts   " << numevts   << endl;
+    cout << " keys:"                    <<  endl;
+    cout << "  project   " << project   << endl;
+    cout << "  source1   " << source    << " (from db -> run "  << seq << ") " << endl;
+    cout << "  source2   " << sourcekey << " (from sequ file) " << endl;
+    if (!(atoi(source.Data())==sourcekey))
+    {
+        cout << "new source name: " << sourcename << " -> inserting..." << endl;
+        sourcekey = QueryNameKEY(serv, dummy, "Source", sourcename.Data(), kFALSE);
+        source=Form("%d",sourcekey);
+    }
+    cout << "  source    " << source    << endl;
+    cout << "  hv        " << hv        << endl;
+    cout << "  delay     " << delay     << endl;
+    cout << "  dt        " << dt        << endl;
+    cout << "  testflag  " << testflag  << endl;
+    cout << "  lightcond " << lightcond << endl;
+    cout << "  l1tt      " << l1tt      << endl;
+    cout << "  l2tt      " << l2tt      << endl;
 
     TString query1="INSERT Sequences SET fManuallyChangedKEY=2, ";