Changeset 7087 for trunk/MagicSoft/Mars

Timestamp:

05/24/05 12:13:03 (19 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/05/24 Daniela Dorner
+
+   * datacenter/macros/fillstar.C:
+     - added new parameters
+
+   * datacenter/macros/setupdb.C:
+     - added variables for the new parameters
+
+
+
  2005/05/23 Daniela Dorner
 

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

@@ -39 +39 @@
 /////////////////////////////////////////////////////////////////////////////
 #include <iostream>
+#include <iomanip>
 
 #include <TEnv.h>
@@ -113 +114 @@
     psf = TMath::Nint(psf*10)/10.;
     TString PSF = Form("%5.1f", psf);
+    Int_t   num = (int)h1->GetEntries();
 
     TProfile *h2 = (TProfile*)arr.FindObjectInCanvas("SizeVsRadius", "TProfile", "MHMuonPar");
@@ -138 +140 @@
     TString islands = Form("%5.1f", quality);
 
+    h = (TH1*)arr.FindObjectInCanvas("EffOnTheta", "TH1D", "EffOnTime");
+    if (!h)
+    {
+        cout << "WARNING - Reading of EffOnTime failed." << endl;
+        return kFALSE;
+    }
+
+    Float_t effon = h->Integral();
+    Float_t rate  = num/effon;
+    rate = TMath::Nint(rate*100)/100.;
+    TString muonrate = Form("%6.2f", rate);
+    Int_t effontime = TMath::Nint(effon);
+
     TString sequence = fname(TRegexp("star[0-9]+[.]root$"));
     if (sequence.IsNull())
@@ -148 +163 @@
 
     cout << "Sequence #" << seq << endl;
-    cout << "  PSF [mm]       " << Form("%5.1f", psf)         << endl;
-    cout << "  Island Quality " << Form("%5.1f", quality)     << endl;
-    cout << "  Ratio [%]      " << Form("%5.1f", ratiodatamc) << 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;
 
     TString query;
@@ -159 +177 @@
                      " fMeanNumberIslands=%s, "
                      " fRatio=%s, "
+                     " fMuonNumber=%d, "
+                     " fEffOnTime=%d, "
+                     " fMuonRate=%s, "
                      " fPSF=%s ",
-                     seq, islands.Data(), ratio.Data(), PSF.Data());
+                     seq, islands.Data(), ratio.Data(),
+                     num, effontime,
+                     muonrate.Data(), PSF.Data());
     }
     else
@@ -167 +190 @@
                      " fMeanNumberIslands=%s, "
                      " fRatio=%s, "
+                     " fMuonNumber=%d, "
+                     " fEffOnTime=%d, "
+                     " fMuonRate=%s, "
                      " fPSF=%s "
                      " WHERE fSequenceFirst=%d ",
-                     islands.Data(), ratio.Data(), PSF.Data(), seq);
+                     islands.Data(), ratio.Data(),
+                     num, effontime,
+                     muonrate.Data(), PSF.Data(), seq);
     }
 

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

@@ -531 +531 @@
          "  fPSF                FLOAT(5,1)            NOT NULL,"
          "  fRatio              FLOAT(5,1)            NOT NULL,"
+         "  fMuonRate           FLOAT(6,2)            NOT NULL,"
+         "  fMuonNumber         INT        UNSIGNED   NOT NULL"
+         "  fEffOnTime          INT        UNSIGNED   NOT NULL"
          "  fLastUpdate         TIMESTAMP"
          ")"));