Changeset 7325 for trunk/MagicSoft/Mars

Timestamp:

08/28/05 00:30:58 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/filldotraw.C (modified) (2 diffs)
• datacenter/macros/filldotrun.C (modified) (1 diff)
• datacenter/macros/setupdb.C (modified) (1 diff)
• datacenter/scripts/dodatacheck (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/08/28 Daniela Dorner
+
+   * datacenter/scripts/dodatacheck:
+     - added 'find-todofile-algorithm' to this script to accelerate the 
+       process of datacheck
+     - changed call of filldotraw.C
+
+   * datacenter/macros/getdolist.C:
+     - added fDataCheckDone for the option to get many todofiles to 
+       accelerate the process of datacheck
+
+   * datacenter/macros/filldotrun.C:
+     - added check: if a run is a testrun, the flag for datacheck is 
+       set to 'not to be done'
+
+   * datacenter/macros/filldotraw.C:
+     - removed database name from the queries
+
+   * datacenter/macros/setupdb.C:
+     - adapted to changes in the table MagicNumber
+
+
 
  2005/08/27 Daniela Dorner

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

@@ -74 +74 @@
 Int_t MagicNumber(MSQLServer &serv, const MRawRunHeader &h)
 {
-    TString query(Form("SELECT fMagicNumberKEY FROM MyMagic.MagicNumber WHERE fMagicNumber=%d",
+    TString query(Form("SELECT fMagicNumberKEY FROM MagicNumber WHERE fMagicNumber=%d",
                        h.GetMagicNumber()));
 
@@ -152 +152 @@
         return 0;
 
-    TString query(Form("UPDATE MyMagic.RunData SET fMagicNumberKEY=%d, fFormatVersion=%d WHERE fRunNumber=%d",
+    TString query(Form("UPDATE RunData SET fMagicNumberKEY=%d, fFormatVersion=%d WHERE fRunNumber=%d",
                        key, h.GetFormatVersion(), h.GetRunNumber()));
 

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

@@ -577 +577 @@
         //create entry in table RunProcessStatus for this runnumber
         TString query2=Form("INSERT RunProcessStatus SET fRunNumber=%d, fTimingCorrection='1970-01-01 00:00:00'",
-                    runnumber);
+                            runnumber);
+        if (testflagkey==1)
+            query+=" , fDataCheckDone='1970-01-01 00:00:00'";
         res = serv.Query(query2);
         if (!res)

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

@@ -193 +193 @@
     list.Add(new TObjString(
         "INSERT MyMagic.MagicNumber (fMagicNumber, fMagicNumberName) VALUES "
-        "  (0x0000, 'Not available'),"
-        "  (0xc0c0, 'Ok'),"
-        "  (0xc0c1, 'Not closed'),"
-        "  (0xffff, 'Wrong')"));
+        "  (0x0001, 'Not available')," //1
+        "  (0xc0c0, 'Ok'),"            //45344
+        "  (0xc0c1, 'Not closed'),"    //45345
+        "  (0x0000, 'Wrong')"));       //0
 
     // Run type

trunk/MagicSoft/Mars/datacenter/scripts/dodatacheck

@@ -151 +151 @@
 
    echo "doing filldotraw..." >> $scriptlog 2>&1
-   check1=`root -q -b $macrospath/filldotraw.C+\($run\,kFALSE\) | tee $filldotrawlogfile | grep int | sed -e 's/.*(int)//'`
+   check1=`root -q -b $macrospath/filldotraw.C+\($rawfile\,kFALSE\) | tee $filldotrawlogfile | grep int | sed -e 's/.*(int)//'`
 
    case $check1 in