Changeset 665 for trunk/MagicSoft/Mars/mdatacheck/MFillAdcSpect.cc

Timestamp:

03/02/01 12:09:07 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mdatacheck/MFillAdcSpect.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mdatacheck/MFillAdcSpect.cc

@@ -25 +25 @@
   // connect the raw data with this task
   
+  fHistos = (MHistosAdc*)pList->FindObject("MHistosAdc");
+  if (!fHistos) 
+    {
+        cout << "MRawFileRead::PreProcess - WARNING: MHistosAdc not found... creating." << endl;
+        fHistos = new MHistosAdc;
+        pList->AddToList(fHistos);
+    }
+
   fRawEvtData = (MRawEvtData*)pList->FindObject("MRawEvtData");
-  
   if (!fRawEvtData)
     {
-      cout << "MRawFileRead::PreProcess - WARNING: MRawEvtData not found... creating." << endl;
-      return kFALSE ; 
+        cout << "MRawFileRead::PreProcess - WARNING: MRawEvtData not found... exit." << endl;
+        return kFALSE;
     }
 
   fPixelIter = new MRawEvtPixelIter( fRawEvtData );
-  
-  fHistos = (MHistosAdc*)pList->FindObject("MHistosAdc");
-  
-  if (!fHistos) 
-    {
-      cout << "MRawFileRead::PreProcess - WARNING: MHistosAdc not found... exit..." << endl;
-      return kFALSE ;  
-    }
-
 
   return kTRUE ; 
@@ -55 +53 @@
   fPixelIter->Reset() ; 
 
-  Int_t iHighSamples = fRawEvtData->GetNumHiGainSamples() ; 
-  Int_t iLowSamples  = fRawEvtData->GetNumLoGainSamples() ; 
+  const Int_t nhisamples = fRawEvtData->GetNumHiGainSamples() ;
+  const Int_t nlosamples = fRawEvtData->GetNumLoGainSamples() ;
 
   //  cout << "HighSamples " << iHighSamples ;
@@ -62 +60 @@
   while ( fPixelIter->Next() )
     { 
-      for (Int_t i=0 ; i< iHighSamples ; i++ )
+      for (Int_t i=0 ; i<nhisamples ; i++ )
         { 
-          fHistos->FillAdcHistHigh ( fPixelIter->GetPixelId(),
+          fHistos->FillAdcHistHi ( fPixelIter->GetPixelId(),
                                      fPixelIter->GetHiGainFadcSamples()[i] );
         }
 
-      for (Int_t i=0 ; i< iLowSamples ; i++ )
+      for (Int_t i=0 ; i<nlosamples ; i++ )
         { 
-          fHistos->FillAdcHistLow ( fPixelIter->GetPixelId(),
+          fHistos->FillAdcHistLo ( fPixelIter->GetPixelId(),
                                     fPixelIter->GetLoGainFadcSamples()[i] );
         }