Changeset 8312 for trunk

Timestamp:

02/09/07 12:40:24 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -36 +36 @@
      - replaced all MF by MFDataPhrase
 
+   * mjobs/MJCalibrateSignal.cc:
+     - changed the extraction range used in the lo-gains from the
+       hi-gain range to the lo-gain range
+
+   * datacenter/macros/fillstar.C:
+     - added filling the spark rate into the database
+
 
 

trunk/MagicSoft/Mars/NEWS

@@ -4 +4 @@
 
    - database: Website to plot values from the database has been added. 
+
+   - database: The rate of spark events as found by star is now kept
+     and the rate after cleaning is now with spark events subtracted
 
    - general: The changes to the interpretation of phrases lead to

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

@@ -125 +125 @@
     }
 
+    MHCamera *hsparks = (MHCamera*)arr.FindObjectInCanvas("Sparks;avg", "MHCamera", "Sparks");
+    if (!hsparks)
+    {
+        cout << "WARNING - Reading of Sparks failed." << endl;
+        return 2;
+    }
+
     TH2F *hcog = (TH2F*)arr.FindObjectInCanvas("Center", "TH2F", "MHHillas");
     if (!hcog)
@@ -197 +204 @@
     }
 
-    Int_t numevents = (int)h->GetEntries();
+    Int_t numsparks = (int)hsparks->GetEntries()
+    Int_t numevents = (int)h->GetEntries() - numsparks;
     Int_t datarate  = (int)(numevents/effon);
+
+    TString sparksrate = Form("%5.2f", numsparks/effon);
 
     TGraph *g = (TGraph*)arr.FindObjectInCanvas("Humidity", "TGraph", "MHWeather");
@@ -258 +268 @@
 
     cout << "Sequence #" << seq << endl;
-    cout << "  Inhomogeneity         " << inhomogen << 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;
-    cout << "  Number of Stars       " << numstarsmed      << " +/- " << numstarsrms       << endl;
-    cout << "  Number of cor. Stars  " << numcormed        << " +/- " << numcorrms         << endl;
-    cout << "  Skybrightness         " << skybrightnessmed << " +/- " << skybrightnessrms  << endl;
+    cout << "  Inhomogeneity            " << inhomogen << 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 (w/o sparks) " << numevents << endl;
+    cout << "  # of Sparks              " << numsparks << endl;
+    cout << "  Rate after ImgCl [Hz]    " << datarate  << endl;
+    cout << "  Rate of sparks [Hz]      " << sparkrate << endl;
+    cout << "  Maximum Humidity [%]     " << maxhum    << endl;
+    cout << "  Number of Stars          " << numstarsmed      << " +/- " << numstarsrms       << endl;
+    cout << "  Number of cor. Stars     " << numcormed        << " +/- " << numcorrms         << endl;
+    cout << "  Skybrightness            " << skybrightnessmed << " +/- " << skybrightnessrms  << endl;
 
     TString query;
@@ -284 +296 @@
                      " fPSF=%s, "
                      " fDataRate=%d, "
+                     " fSparkRate=%s, "
                      " fMaxHumidity=%s ,"
                      " fNumStarsMed=%s ,"
@@ -295 +308 @@
                      num, effontime,
                      muonrate.Data(), PSF.Data(),
-                     datarate, maxhum.Data(),
+                     datarate, sparkrate.Data(), maxhum.Data(),
                      numstarsmed.Data(), numstarsrms.Data(),
                      numcorsmed.Data(), numcorsrms.Data(),
@@ -311 +324 @@
                      " fPSF=%s, "
                      " fDataRate=%d, "
+                     " fSparkRate=%s, "
                      " fMaxHumidity=%s, "
                      " fNumStarsMed=%s ,"
@@ -323 +337 @@
                      num, effontime,
                      muonrate.Data(), PSF.Data(),
-                     datarate, maxhum.Data(),
+                     datarate, sparkrate.Data(), maxhum.Data(),
                      numstarsmed.Data(), numstarsrms.Data(),
                      numcorsmed.Data(), numcorsrms.Data(),