Changeset 2331 for trunk/MagicSoft/Mars/mhist

Timestamp:

09/12/03 15:43:56 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHFadcCam.cc (modified) (2 diffs)
• MHFadcPix.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MHFadcCam.cc

@@ -102 +102 @@
     if (fType==MHFadcPix::kSlices)
     {
+        const Int_t nhi = par->GetNumHiGainSamples();
+
+        //
+        // skip MC events without FADC information stored
+        //
+        if (nhi==0)
+            return kTRUE;
+
         const Int_t nlo = par->GetNumLoGainSamples();
-        const Int_t nhi = par->GetNumHiGainSamples();
 
         //
@@ -112 +119 @@
                 (*this)[i].Init(nhi, nlo);
         else
-            if (fNumHiGains!=nhi || fNumLoGains!=nlo)
+        {
+            if (fNumLoGains!=nlo)
             {
-                *fLog << err << dbginf << "ERROR - Number of lo- or hi-gain samples changed." << endl;
+                *fLog << err << dbginf << "ERROR - Number of lo-gain samples changed from " << fNumLoGains << " to " << nlo << endl;
                 return kFALSE;
             }
+            if (fNumHiGains!=nhi)
+            {
+                *fLog << err << dbginf << "ERROR - Number of hi-gain samples changed from " << fNumHiGains << " to " << nhi << endl;
+                return kFALSE;
+            }
+        }
 
         fNumHiGains = nhi;

trunk/MagicSoft/Mars/mhist/MHFadcPix.cc

@@ -54 +54 @@
     fHistHi.SetTitle(pixid ? Form("Hi Gain Pixel #%d", pixid) : "Hi Gain Samples");
     fHistHi.SetDirectory(NULL);
+    fHistHi.UseCurrentStyle();
 
     fHistLo.SetName(pixid ? Form("LoGain%03d", pixid) : "LoGain");
     fHistLo.SetTitle(pixid ? Form("Lo Gain Pixel #%d", pixid) : "Lo Gain Samples");
     fHistLo.SetDirectory(NULL);
+    fHistLo.UseCurrentStyle();
 
     if (fType==kValue)