Changeset 7262 for trunk/MagicSoft

Timestamp:

08/04/05 20:09:28 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/fillsinope.C (added)
• datacenter/macros/setupdb.C (modified) (2 diffs)
• sinope.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
      - added option --outf to make it possible to give the filename 
        (needed for automation of datacheck)
+     - added output in txt-file in case of no events (needed for the 
+       evaluation of runs with no interlaced events)
+     - small changes in output
+
+   * datacenter/macros/setupdb.C:
+     - added new table (DataCheck)
+
+   * datacenter/macros/fillsinope.C:
+     - added (macro to read in the sinope*.txt files and fill the 
+       information into the DB)
+
+   * datacenter/macros/filldotraw.C:
+     - added (was before in the directory macros/sql/)
+     - made some changes to include it into the automation 
+       added function make it possible to call the macro not only 
+       with the filename but also with the runnumber
+
+   * macros/sql/*:
+     - removed (all macros are now in the datacenter directory)
 
 

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

@@ -418 +418 @@
 
     list.Add(new TObjString(
-         "CREATE TABLE MyMagic.%s ("
+         "CREATE TABLE MyMagic.ExcludedFDA ("
          "  fExcludedFDAKEY        SMALLINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,"
          "  fExcludedFDAImportance SMALLINT UNSIGNED        NULL,"
@@ -425 +425 @@
          "  fExcludedFDA           VARCHAR(255)             NULL"
          ") MAX_ROWS=65536"));
+
+
+    list.Add(new TObjString(
+         "CREATE TABLE MyMagic.DataCheck ("
+         "  fRunNumber                INT      UNSIGNED PRIMARY KEY,"
+         "  fEvents                   INT      UNSIGNED        NULL,"
+         "  fPositionSignal           TINYINT  UNSIGNED        NULL,"
+         "  fPositionFWHM             TINYINT  UNSIGNED        NULL,"
+         "  fHeightSignal             SMALLINT UNSIGNED        NULL,"
+         "  fHeightFWHM               SMALLINT UNSIGNED        NULL,"
+         "  fHasSignal                ENUM(\"yes\",\"no\")     NULL,"
+         "  fHasPedestal              ENUM(\"yes\",\"no\")     NULL,"
+         "  fPositionAsym             ENUM(\"yes\",\"no\")     NULL,"
+         "  fHeightAsym               ENUM(\"yes\",\"no\")     NULL,"
+         "  fEventsInterlaced         INT      UNSIGNED        NULL,"
+         "  fPositionSignalInterlaced TINYINT  UNSIGNED        NULL,"
+         "  fPositionFWHMInterlaced   TINYINT  UNSIGNED        NULL,"
+         "  fHeightSignalInterlaced   SMALLINT UNSIGNED        NULL,"
+         "  fHeightFWHMInterlaced     SMALLINT UNSIGNED        NULL,"
+         "  fHasSignalInterlaced      ENUM(\"yes\",\"no\")     NULL,"
+         "  fHasPedestalInterlaced    ENUM(\"yes\",\"no\")     NULL,"
+         "  fPositionAsymInterlaced   ENUM(\"yes\",\"no\")     NULL,"
+         "  fHeightAsymInterlaced     ENUM(\"yes\",\"no\")     NULL"
+         ")"));
 
 

trunk/MagicSoft/Mars/sinope.cc

@@ -117 +117 @@
     {
         gLog << warn << "No entries processed..." << endl;
-        return kFALSE;
+
+        ofstream fout(Form("%stxt", kOutpath.Data()));
+        if (!fout)
+        {
+            gLog << err << "Cannot open file: " << strerror(errno) << endl;
+            return kERROR;
+        }
+
+        fout << "Events:         " << events << endl;
+        fout << endl;
+
+        return kTRUE;
     }
 
@@ -164 +175 @@
 
     fout << "Events:         " << events << endl;
-    fout << "HasSignals:     " << (fwhm1>10?"No":"Yes") << endl;
-    fout << "HasPedestal:    " << (fwhm1<20?"No":"Yes") << endl;
+    fout << "HasSignal:      " << (fwhm1>10?"no":"yes") << endl;
+    fout << "HasPedestal:    " << (fwhm1<20?"no":"yes") << endl;
     fout << endl;
     fout << "PositionSignal: " << h1.GetMaximumBin()-1 << endl;
     fout << "PositionFWHM:   " << fwhm1 << endl;
-    fout << "PositionAsym:   " << (asym1?"Yes":"No") << endl;
+    fout << "PositionAsym:   " << (asym1?"yes":"no") << endl;
     fout << endl;
     fout << "HeightSignal:   " << h2.GetMaximumBin()-1 << endl;
     fout << "HeightFWHM:     " << fwhm2 << endl;
-    fout << "HeightAsym:     " << (asym2?"Yes":"No") << endl;
+    fout << "HeightAsym:     " << (asym2?"yes":"no") << endl;
     fout << endl;