Changeset 2781 for trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

Timestamp:

01/13/04 13:22:38 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -38 +38 @@
 //  Output Containers:
 //    MCerPhotEvt     the data container for all data.
-//    MPedestalCam    ct1 pedestals
+//    MPedPhotCam     CT1 pedestals
 //    MMcEvt          monte carlo data container for MC files
 //    MMcTrig         mc data container for trigger information
@@ -67 +67 @@
 #include "MCerPhotEvt.h"
 
-#include "MPedestalPix.h"
-#include "MPedestalCam.h"
+#include "MPedPhotPix.h"
+#include "MPedPhotCam.h"
 
 #include "MGeomCam.h"
@@ -355 +355 @@
     for (Int_t i=0; i<iMAXNUMPIX; i++)
     {
-        (*fPedest)[i].SetPedestalRms(outpars.frms_pedsig_phot[i]);
+        (*fPedest)[i].Set(0, outpars.frms_pedsig_phot[i]);
         *fLog << outpars.frms_pedsig_phot[i] << " "; 
         fPedRMS[i] = outpars.frms_pedsig_phot[i];
@@ -722 +722 @@
 // them if they don't exist.
 //
-// Initialize the size of the MPedestalCam container to 127 pixels (CT1 camera)
+// Initialize the size of the MPedPhotCam container to 127 pixels (CT1 camera)
 //
 Int_t MCT1ReadPreProc::PreProcess(MParList *pList)
@@ -754 +754 @@
     //  look for the pedestal class in the plist
     //
-    fPedest = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
+    fPedest = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam");
     if (!fPedest)
         return kFALSE;
@@ -901 +901 @@
     // reset pedestal RMS for this event
     for (Int_t i=0; i<iMAXNUMPIX; i++)
-        (*fPedest)[i].SetPedestalRms(fPedRMS[i]);
+        (*fPedest)[i].Set(0, fPedRMS[i]);
 
     //  int   isecs_since_midday; // seconds passed since midday before sunset (JD of run start)
@@ -944 +944 @@
             continue;
 
-        fNphot->AddPixel(i, 0.1*event.spixsig_10thphot[i],
-                         (*fPedest)[i].GetPedestalRms());
+        fNphot->AddPixel(i, 0.1*event.spixsig_10thphot[i], (*fPedest)[i].GetRms());
     }
     fNphot->FixSize();