Changeset 6857 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

03/18/05 17:54:02 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MPedPhotCalc.cc (modified) (7 diffs)
• MPedPhotCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedPhotCalc.cc

@@ -20 +20 @@
 !   Author(s): Markus Gaug 4/2004 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2005
 !
 !
@@ -36 +36 @@
 //
 //  Input Containers:
-//   MCerPhotEvt
+//   MSignalCam
 //
 //  Output Containers:
@@ -50 +50 @@
 #include "MRawRunHeader.h"
 
-#include "MCerPhotPix.h"
-#include "MCerPhotEvt.h"
+#include "MSignalPix.h"
+#include "MSignalCam.h"
 
 #include "MPedPhotPix.h"
@@ -77 +77 @@
 // Look for the following input containers:
 //
-//  - MCerPhotEvt
+//  - MSignalCam
 //  - MBadPixelsCam
 // 
@@ -88 +88 @@
 {      
   // Look for input container
-  fCerPhot = (MCerPhotEvt*)pList->FindObject("MCerPhotEvt");
+  fCerPhot = (MSignalCam*)pList->FindObject("MSignalCam");
   if (!fCerPhot)
     {
-      *fLog << err << "MPedPhotCalc::PreProcess Error: MCerPhotEvt not found... aborting." << endl;
+      *fLog << err << "MSignalCam not found... aborting." << endl;
       return kFALSE;
     }
@@ -98 +98 @@
   fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam");
   if (!fBadPixels)
-    {
-      *fLog << warn << "MPedPhotCalc::PreProcess Warning: No MBadPixelsCam found." << endl;
-    }
+      *fLog << warn << "WARNING - MBadPixelsCam not found... ignored." << endl;
 
   // Create output container
@@ -143 +141 @@
 Int_t MPedPhotCalc::Process()
 {
-    for(UInt_t i=0;i<fCerPhot->GetNumPixels();i++)
+    const UInt_t n = fCerPhot->GetNumPixels();
+    for(UInt_t idx=0; idx<n; idx++)
     {
-       const MCerPhotPix &pix = (*fCerPhot)[i];
-       const Int_t pixidx = pix.GetPixId();
-
-       const Float_t nphot = pix.GetNumPhotons();
+       const Float_t nphot = (*fCerPhot)[idx].GetNumPhotons();
        
-       fSumx[pixidx]  += nphot;
-       fSumx2[pixidx] += nphot*nphot;
+       fSumx[idx]  += nphot;
+       fSumx2[idx] += nphot*nphot;
     }
 

trunk/MagicSoft/Mars/mpedestal/MPedPhotCalc.h

@@ -11 +11 @@
 
 class MPedPhotCam;
-class MCerPhotEvt;
+class MSignalCam;
 class MBadPixelsCam;
 class MPedPhotCalc : public MTask
@@ -17 +17 @@
 
   MPedPhotCam   *fPedestals;  // Pedestals of all pixels in the camera
-  MCerPhotEvt   *fCerPhot;    // Calibrated Cherenkov events 
+  MSignalCam    *fCerPhot;    // Calibrated Cherenkov events
   MBadPixelsCam *fBadPixels;  // Bad Pixels