Changeset 2239

Timestamp:

06/26/03 20:28:20 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfileio/MCT1ReadAscii.cc (modified) (2 diffs)
• mfileio/MCT1ReadPreProc.cc (modified) (3 diffs)
• mhist/MHSigmaPixel.cc (modified) (1 diff)
• mhist/MHSigmaTheta.cc (modified) (1 diff)
• mimage/MImgCleanStd.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/06/26: Abelardo Moralejo
+
+  * mfileio/MCT1ReadAscii.cc, MCT1ReadPreProc.cc
+    mhist/MHSigmaPixel.cc, MHSigmaTheta.cc
+    mimage/MImgCleanStd.cc
+
+     - adapted to new function names in MPedestalPix (please Thomas
+       check these, I had to do it to make Mars compile)
 
  2003/06/26: Thomas Bretz

trunk/MagicSoft/Mars/mfileio/MCT1ReadAscii.cc

@@ -211 +211 @@
 
         if (val > 0.0)
-            (*fPedest)[i].SetMeanRms(val);
+            (*fPedest)[i].SetPedestalRms(val);
     }
 }
@@ -251 +251 @@
 
         if (nphot > 0.0)
-            fNphot->AddPixel(i, nphot, (*fPedest)[i].GetMeanRms());
+            fNphot->AddPixel(i, nphot, (*fPedest)[i].GetPedestalRms());
     }
     fNphot->FixSize();

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -361 +361 @@
     for (Int_t i=0; i<iMAXNUMPIX; i++)
     {
-        (*fPedest)[i].SetMeanRms(outpars.frms_pedsig_phot[i]);
+        (*fPedest)[i].SetPedestalRms(outpars.frms_pedsig_phot[i]);
         *fLog << outpars.frms_pedsig_phot[i] << " "; 
         fPedRMS[i] =  outpars.frms_pedsig_phot[i];
@@ -907 +907 @@
     // reset pedestal RMS for this event
     for (Int_t i=0; i<iMAXNUMPIX; i++)
-        (*fPedest)[i].SetMeanRms(fPedRMS[i]);
+        (*fPedest)[i].SetPedestalRms(fPedRMS[i]);
 
     //  int   isecs_since_midday; // seconds passed since midday before sunset (JD of run start)
@@ -951 +951 @@
 
         fNphot->AddPixel(i, 0.1*event.spixsig_10thphot[i],
-                         (*fPedest)[i].GetMeanRms());
+                         (*fPedest)[i].GetPedestalRms());
     }
     fNphot->FixSize();

trunk/MagicSoft/Mars/mhist/MHSigmaPixel.cc

@@ -115 +115 @@
     {
         const MPedestalPix pix = ped[i];
-        fHist.Fill(i, pix.GetSigma());
+        fHist.Fill(i, pix.GetPedestalRms());
     }
     return kTRUE;

trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc

@@ -206 +206 @@
         const MPedestalPix &pix = (*fPed)[id];
 
-        const Double_t sigma = pix.GetMeanRms();
+        const Double_t sigma = pix.GetPedestalRms();
         const Double_t area  = fCam->GetPixRatio(id);
 

trunk/MagicSoft/Mars/mimage/MImgCleanStd.cc

@@ -336 +336 @@
 
         const Float_t entry = pix.GetNumPhotons();
-        const Float_t noise = (*fPed)[idx].GetSigma();
+        const Float_t noise = (*fPed)[idx].GetPedestalRms();
 
         //
@@ -496 +496 @@
     //
     const Float_t entry = pix.GetNumPhotons();
-    const Float_t noise = (*fPed)[idx].GetSigma();
+    const Float_t noise = (*fPed)[idx].GetPedestalRms();
 
     //