Changeset 666 for trunk/MagicSoft/Mars/mdatacheck

Timestamp:

03/02/01 12:48:15 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mdatacheck

Files:

• DataCheckLinkDef.h (modified) (1 diff)
• MDumpEvtHeader.cc (modified) (1 diff)
• MDumpEvtHeader.h (modified) (2 diffs)
• MFillAdcSpect.cc (modified) (5 diffs)
• MFillAdcSpect.h (modified) (2 diffs)
• MShowSpect.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h

@@ -7 +7 @@
 #pragma link C++ class MShowSpect;
 #pragma link C++ class MHistosAdc;
+#pragma link C++ class MFillAdcSpect;
+
+#pragma link C++ class MDumpEvtHeader;
 
 #endif

trunk/MagicSoft/Mars/mdatacheck/MDumpEvtHeader.cc

@@ -1 +1 @@
 #include "MDumpEvtHeader.h"
 
-#include <iostream.h>
-
+#include "MLog.h"
+#include "MLogManip.h"
 #include "MParList.h"
 #include "MRawEvtHeader.h"
 #include "MRawEvtPixelIter.h"
 
-//ClassImp(MDumpEvtHeader)
+ClassImp(MDumpEvtHeader)
 
 Bool_t MDumpEvtHeader::PreProcess (MParList *pList)
 {
-  fRawEvtHeader = (MRawEvtHeader*)pList->FindObject("MRawEvtHeader");
-  if (!fRawEvtHeader)
+    fRawEvtHeader = (MRawEvtHeader*)pList->FindObject("MRawEvtHeader");
+    if (!fRawEvtHeader)
     {
-      cout << "MRawFileRead::PreProcess - WARNING: MRawEvtHeader not found... creating." << endl;
-      return kFALSE ; 
-    }
-  
-  fRawEvtData = (MRawEvtData*)pList->FindObject("MRawEvtData");
-  
-  if (!fRawEvtData)
-    {
-      cout << "MRawFileRead::PreProcess - WARNING: MRawEvtData not found... creating." << endl;
-      return kFALSE ; 
+        *fLog << dbginf << " Error: MRawEvtHeader not found... exit." << endl;
+        return kFALSE ;
     }
 
-  fPixelIter = new MRawEvtPixelIter( fRawEvtData );
-  
-  return kTRUE ; 
+    fRawEvtData = (MRawEvtData*)pList->FindObject("MRawEvtData");
+    if (!fRawEvtData)
+    {
+        *fLog << dbginf << " Error: MRawEvtData not found... exit." << endl;
+        return kFALSE ;
+    }
 
+    return kTRUE ;
 } 
 
-    
 Bool_t MDumpEvtHeader::Process()
 {
   fRawEvtHeader->Print() ; 
 
-  //fRawEvtData->Print() ; 
+  MRawEvtPixelIter pixel( fRawEvtData );
 
-  fPixelIter->Reset() ; 
+  while ( pixel.Next() )
+  {
+      *fLog << " " << pixel.GetPixelId() ;
+  }
 
-  while ( fPixelIter->Next() )
-    { 
-      cout << " " << fPixelIter->GetPixelId() ; 
-      
-    } 
-
-  cout << endl ; 
+  *fLog << endl ;
   
   return kTRUE;
-
 } 

trunk/MagicSoft/Mars/mdatacheck/MDumpEvtHeader.h

@@ -12 +12 @@
 class MRawEvtHeader;
 class MRawEvtData;
-class MRawEvtPixelIter;
 class MParList;
 
@@ -21 +20 @@
   MRawEvtData      *fRawEvtData;
 
-  MRawEvtPixelIter *fPixelIter ; 
-
- public:   
-  MDumpEvtHeader () { 
-    fRawEvtHeader = NULL ; 
-  } ; 
+ public:
+  MDumpEvtHeader () : fRawEvtHeader(NULL) { } ;
 
   Bool_t PreProcess(MParList *pList);
   Bool_t Process() ;
   
-  //  ClassDef(MDumpEvtHeader, 1)       // Task to read the raw data binary file
+  ClassDef(MDumpEvtHeader, 1)   // Class to dump the pixel ids of a raw evt to the screen
 
 };

trunk/MagicSoft/Mars/mdatacheck/MFillAdcSpect.cc

@@ -1 +1 @@
 #include "MFillAdcSpect.h"
 
-#include <iostream.h>
-
+#include "MLog.h"
+#include "MLogManip.h"
 #include "MParList.h"
 #include "MHistosAdc.h"
@@ -8 +8 @@
 #include "MRawEvtPixelIter.h"
 
-//ClassImp(MFillAdcSpect)
+ClassImp(MFillAdcSpect)
 
-MFillAdcSpect::MFillAdcSpect (const char *name, const char *title)
+    MFillAdcSpect::MFillAdcSpect (const char *name, const char *title) : fRawEvtData(NULL)
 {
   *fName  = name  ? name  : "MFillAdcSpect";
   *fTitle = title ? title : "Task to fill the adc spectra with  raw data";
-  
-  fRawEvtData   = NULL ; 
-  fPixelIter    = NULL ; 
 }
-
-
 
 Bool_t MFillAdcSpect::PreProcess (MParList *pList)
@@ -25 +20 @@
   // 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);
-    }
+  fHistos = (MHistosAdc*)pList->FindCreateObj("MHistosAdc");
+  if (!fHistos)
+      return kFALSE;
 
-  fRawEvtData = (MRawEvtData*)pList->FindObject("MRawEvtData");
+  fRawEvtData = (MRawEvtData*)pList->FindCreateObj("MRawEvtData");
   if (!fRawEvtData)
-    {
-        cout << "MRawFileRead::PreProcess - WARNING: MRawEvtData not found... exit." << endl;
-        return kFALSE;
-    }
-
-  fPixelIter = new MRawEvtPixelIter( fRawEvtData );
+  {
+      *fLog << dbginf << " Error: MRawEvtData not found... exit." << endl;
+      return kFALSE ;
+  }
 
   return kTRUE ; 
@@ -46 +35 @@
 } 
 
-    
 Bool_t MFillAdcSpect::Process()
 {
   //  loop over the pixels and fill the values in the histograms
   
-  fPixelIter->Reset() ; 
+  MRawEvtPixelIter pixel(fRawEvtData);
 
   const Int_t nhisamples = fRawEvtData->GetNumHiGainSamples() ;
@@ -58 +46 @@
   //  cout << "HighSamples " << iHighSamples ;
 
-  while ( fPixelIter->Next() )
+  while ( pixel.Next() )
     { 
       for (Int_t i=0 ; i<nhisamples ; i++ )
         { 
-          fHistos->FillAdcHistHi ( fPixelIter->GetPixelId(),
-                                     fPixelIter->GetHiGainFadcSamples()[i] );
+          fHistos->FillAdcHistHi ( pixel.GetPixelId(),
+                                   pixel.GetHiGainFadcSamples()[i] );
         }
 
       for (Int_t i=0 ; i<nlosamples ; i++ )
         { 
-          fHistos->FillAdcHistLo ( fPixelIter->GetPixelId(),
-                                    fPixelIter->GetLoGainFadcSamples()[i] );
+          fHistos->FillAdcHistLo ( pixel.GetPixelId(),
+                                   pixel.GetLoGainFadcSamples()[i] );
         }
     } 

trunk/MagicSoft/Mars/mdatacheck/MFillAdcSpect.h

@@ -13 +13 @@
 class MHistosAdc;
 class MRawEvtData;
-class MRawEvtPixelIter;
 
 class MFillAdcSpect : public MTask {
  private:
   MRawEvtData      *fRawEvtData;
-  MRawEvtPixelIter *fPixelIter ; 
 
   MHistosAdc       *fHistos ; 
@@ -28 +26 @@
   Bool_t Process() ;
   
-  //  ClassDef(MFillAdcSpect, 1)        // Task to read the raw data binary file
+  ClassDef(MFillAdcSpect, 1)    // Task to fill a MHistosAdc Container with data
 
 };

trunk/MagicSoft/Mars/mdatacheck/MShowSpect.cc

@@ -1 +1 @@
 #include "MShowSpect.h"
 
-#include <iostream.h>
-
+#include "MLog.h"
+#include "MLogManip.h"
 #include "MParList.h"      // MParList
 #include "MGDisplayAdc.h"  // MGDisplayAdc
@@ -36 +36 @@
   if (!fHists)
     {
-      cout << "ERROR: MShowSpect::PreProc(): " << fHistName << " not found!" << endl;
-      return kFALSE;
+        *fLog << dbginf << " Error: MHistosAdc '" << fHistName << "' not found!" << endl;
+        return kFALSE;
     }