Changeset 8343 for trunk

Timestamp:

03/01/07 21:20:41 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mhcalib/MHCalibrationPulseTimeCam.cc (modified) (3 diffs)
• mpedestal/MPedCalcFromLoGain.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.28 2007-03-01 18:21:08 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.29 2007-03-01 21:16:55 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -310 +310 @@
   const Int_t samples = fRunHeader->GetNumSamples();
   SetBinning(samples, -0.5, samples-0.5);
-  
+
   if (fHiGainArray->GetSize()==0)
   {
@@ -443 +443 @@
         continue;
 
-      const Float_t time = (Float_t)maxpos;
-
-      (*this)[i].FillHist(time);
+      (*this)[i].FillHist(maxpos);
         
       const Int_t aidx   = (*fGeom)[i].GetAidx();
       const Int_t sector = (*fGeom)[i].GetSector();
 
-      fSumhiarea[aidx]      += time;
-      fSumhisector[sector]  += time;
-      
+      fSumhiarea[aidx]      += maxpos;
+      fSumhisector[sector]  += maxpos;
+
       fAverageAreaNum[aidx]++;
       fAverageSectorNum[sector]++;

trunk/MagicSoft/Mars/mpedestal/MPedCalcFromLoGain.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.35 2007-02-03 20:03:35 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedCalcFromLoGain.cc,v 1.36 2007-03-01 21:20:41 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -357 +357 @@
 Int_t MPedCalcFromLoGain::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    Bool_t rc=kFALSE;
+    Int_t rc=MExtractPedestal::ReadEnv(env, prefix, print);
+    if (rc==kERROR)
+        return kERROR;
 
     // find resource for pedestal update