Changeset 8891 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

05/15/08 19:37:27 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.10 2008-05-14 11:03:24 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.11 2008-05-15 18:37:26 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -158 +158 @@
 Int_t MPedestalSubtract::Process()
 {
+    // Please note:
+    //   - for data with only hi-gain samples numl is 0
+    //   - for data with hi- and lo-gain samples
+    //     numl is 0 if read from a raw-data file or a new MC root-file(?)
+    //     numl is not 0 if read from an old MC root-file
+
     // Total number of samples
     const Int_t numh = fRawEvt->GetNumHiGainSamples();
@@ -167 +173 @@
 
     // Check for consistency (our simulation can do weird things!)
-    if (numh!=fRunHeader->GetNumSamplesHiGain())
-    {
-        *fLog << warn << "WARNING - Number of hi-gain samples (" << numh << ") ";
-        *fLog << " doesn't match run-header (" << fRunHeader->GetNumSamplesHiGain() << ")." << endl;
-    }
-    if (numl!=fRunHeader->GetNumSamplesLoGain())
-    {
-        *fLog << warn << "WARNING - Number of lo-gain samples (" << numl << ") ";
-        *fLog << " doesn't match run-header (" << fRunHeader->GetNumSamplesLoGain() << ")." << endl;
+    if (numh+numl!=fRunHeader->GetNumSamplesHiGain()+fRunHeader->GetNumSamplesLoGain())
+    {
+        *fLog << err << "MPedestalSubtract::Process: ERROR - Number of samples in event ";
+        *fLog << "(hi+lo=" << numh+numl << ")" << endl << " doesn't match number in run-header ";
+        *fLog << "(" << fRunHeader->GetNumSamplesHiGain()+fRunHeader->GetNumSamplesLoGain() << ")" << endl;
+        *fLog << " In case you are processing real data you have just found a bug." << endl;
+        *fLog << " If you process Monte Carlo data, it means probably that the length" << endl;
+        *fLog << " of the arrays in MRawEvtData are inconsistent with the run-header." << endl;
+        return kERROR;
     }