Changeset 7118

Timestamp:

05/31/05 19:10:11 (20 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/fillstar.C (modified) (5 diffs)
• datacenter/macros/setupdb.C (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/05/31 Daniela Dorner
+
+   * datacenter/macros/fillstar.C:
+     - added two new parameters
+
+   * datacenter/macros/setupdb.C:
+     - adapted to changes in DB (added two columns)
+
+
+
  2005/05/31 Thomas Bretz
 

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

@@ -45 +45 @@
 
 #include <TH1.h>
+#include <TGraph.h>
 #include <TProfile.h>
 #include <TFile.h>
@@ -149 +150 @@
     if (!h)
     {
-        cout << "WARNING - Reading of EffOnTime failed." << endl;
-        return kFALSE;
+        cout << "WARNING - Reading of EffOnTheta failed." << endl;
+        return 0;
     }
 
     Float_t effon = h->Integral();
-    Float_t rate  = num/effon;
-    rate = TMath::Nint(rate*100)/100.;
-    TString muonrate = Form("%6.2f", rate);
+    Float_t mrate  = num/effon;
+    mrate = TMath::Nint(mrate*100)/100.;
+    TString muonrate = Form("%6.2f", mrate);
     Int_t effontime = TMath::Nint(effon);
+
+    h = (TH1*)arr.FindObjectInCanvas("ProjDeltaT", "TH1D", "EffOnTime");
+    if (!h)
+    {
+        cout << "WARNING - Reading of ProjDeltaT failed." << endl;
+        return 0;
+    }
+
+    Int_t numevents = (int)h->GetEntries();
+    Int_t datarate  = (int)(numevents/effon);
+
+    TGraph *g = (TGraph*)arr.FindObjectInCanvas("Humidity", "TGraph", "MHWeather");
+    if (!g)
+    {
+        cout << "WARNING - Reading of Humidity failed." << endl;
+        return 0;
+    }
+
+    Double_t max = TMath::MaxElement(g->GetN(), g->GetY());
+    TString maxhum = Form("%6.1f", max);
+
 
     TString sequence = fname(TRegexp("star[0-9]+[.]root$"));
@@ -169 +191 @@
 
     cout << "Sequence #" << seq << endl;
-    cout << "  PSF [mm]       " << PSF       << endl;
-    cout << "  Island Quality " << islands   << endl;
-    cout << "  Ratio [%]      " << ratio     << endl;
-    cout << "  Muon Number    " << num       << endl;
-    cout << "  EffOnTime [s]  " << effontime << endl;
-    cout << "  Muon Rate [Hz] " << muonrate  << endl;
+    cout << "  PSF [mm]              " << PSF       << endl;
+    cout << "  Island Quality        " << islands   << endl;
+    cout << "  Ratio [%]             " << ratio     << endl;
+    cout << "  Muon Number           " << num       << endl;
+    cout << "  EffOnTime [s]         " << effontime << endl;
+    cout << "  Muon Rate [Hz]        " << muonrate  << endl;
+    cout << "  # of Events           " << numevents << endl;
+    cout << "  Rate after ImgCl [Hz] " << datarate  << endl;
+    cout << "  Maximum Humidity [%]  " << maxhum    << endl;
 
     TString query;
@@ -186 +211 @@
                      " fEffOnTime=%d, "
                      " fMuonRate=%s, "
-                     " fPSF=%s ",
+                     " fPSF=%s, "
+                     " fDataRate=%d, "
+                     " fMaxHumidity=%s ",
                      seq, islands.Data(), ratio.Data(),
                      num, effontime,
-                     muonrate.Data(), PSF.Data());
+                     muonrate.Data(), PSF.Data(),
+                     datarate, maxhum.Data());
     }
     else
@@ -199 +227 @@
                      " fEffOnTime=%d, "
                      " fMuonRate=%s, "
-                     " fPSF=%s "
+                     " fPSF=%s, "
+                     " fDataRate=%d, "
+                     " fMaxHumidity=%s "
                      " WHERE fSequenceFirst=%d ",
                      islands.Data(), ratio.Data(),
                      num, effontime,
-                     muonrate.Data(), PSF.Data(), seq);
+                     muonrate.Data(), PSF.Data(),
+                     datarate, maxhum.Data(), seq);
     }
 

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

@@ -532 +532 @@
          "  fRatio              FLOAT(5,1)            NOT NULL,"
          "  fMuonRate           FLOAT(6,2)            NOT NULL,"
-         "  fMuonNumber         INT        UNSIGNED   NOT NULL"
-         "  fEffOnTime          INT        UNSIGNED   NOT NULL"
+         "  fMuonNumber         INT        UNSIGNED   NOT NULL,"
+         "  fEffOnTime          INT        UNSIGNED   NOT NULL,"
+         "  fDataRate           INT        UNSIGNED   NOT NULL,"
+         "  fMaxHumidity        FLOAT(6,1)            NOT NULL,"
          "  fLastUpdate         TIMESTAMP"
          ")"));
@@ -558 +560 @@
          "  fCCFilled              DATETIME             NULL,"
          "  fExclusionsDone        DATETIME             NULL,"
-         "  fSequenceEntriesBuilt  DATETIME             NULL,"
+         "  fSequenceEntriesBuilt  DATETIME             NULL"
          ")";