Changeset 7846 for trunk/MagicSoft/Mars

Timestamp:

08/04/06 10:43:50 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• datacenter/macros/fillsignal.C (modified) (3 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)

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

@@ -131 +131 @@
     }
 
-    MHCamera *pulhi = (MHCamera*)arr.FindObjectInCanvas("PulseHi;avg", "TH1D", "PulseHi");
-    if (!pulhi)
-    {
-        cout << "WARNING - Reading of PulseHi failed." << endl;
-        return 2;
-    }
-    MHCamera *pullo = (MHCamera*)arr.FindObjectInCanvas("PulseLo;avg", "TH1D", "PulseLo");
-    if (!pullo)
-    {
-        cout << "WARNING - Reading of PulseLo failed." << endl;
+    MHCamera *hilo = (MHCamera*)arr.FindObjectInCanvas("HiLoOff;avg", "MHCamera", "HiLoOff");
+    if (!hilo)
+    {
+        cout << "WARNING - Reading of HiLoOff failed." << endl;
         return 2;
     }
@@ -207 +201 @@
     Double_t meanlo  = TMath::Nint(pullo->GetMean()*100.)/100.;
     Double_t rmslo   = TMath::Nint(pullo->GetRMS() *100.)/100.;
- */
     pullo->Add(pullo, pulhi, 1, -1);
     pullo->ResetBit(MHCamera::kProfile);
@@ -213 +206 @@
     Double_t meanoff = TMath::Nint(pullo->GetMean()*100.)/100.;
     Double_t rmsoff  = TMath::Nint(pullo->GetRMS() *100.)/100.;
+ */
+    Double_t meanoff = TMath::Nint(hilo->GetMean()*100.)/100.;
+    Double_t rmsoff  = TMath::Nint(hilo->GetRMS() *100.)/100.;
 
     //get sequence number from the filename

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -584 +584 @@
     //MHCamEvent evtH( 11, "PulseHi",    "Pulse Position of Hi-Gain;;T");
     //MHCamEvent evtL( 10, "PulseLo",    "Pulse Position of Lo-Gain;;T");
-    MHCamEvent evtR(  4, "HiLoCal",    "Hi-Lo Gain ratio;;");
-    MHCamEvent evtO(  7, "HiLoOff",    "Hi-Lo Offset;;");
+    MHCamEvent evtR(  4, "HiLoCal",    "Hi-/Lo-Gain ratio;;Ratio");
+    MHCamEvent evtO(  7, "HiLoOff",    "Hi-/Lo-Gain Offset;;Offset");
     evt6.SetThreshold();