Changeset 3751 for trunk/MagicSoft

Timestamp:

04/15/04 15:15:58 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCerPhotPix.cc (modified) (1 diff)
• manalysis/MCerPhotPix.h (modified) (3 diffs)
• mcalib/MCalibrate.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -24 +24 @@
        works if there is indeed a colour or if the run nubmer is smaller 
        than 20000 -> take ct1
-
-   * manalysis/MCerPhotPix.[h,cc]
-     - added one variable fTime (with Getter and Setter)
 
    * mcalib/MCalibrateRelTimes.[h,cc]

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc

@@ -60 +60 @@
 //
 MCerPhotPix::MCerPhotPix(Int_t pix, Float_t phot, Float_t errphot) :
-    fPixId(pix), fRing(1), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot), fTime(-1.), fIsSaturated(kFALSE), fIsHGSaturated(kFALSE)
+    fPixId(pix), fRing(1), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot), 
+    fIsSaturated(kFALSE), fIsHGSaturated(kFALSE)
 {
 } 

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h

@@ -17 +17 @@
     Float_t  fPhot;      // The number of Cerenkov photons
     Float_t  fErrPhot;   // the error of fPhot
-    Float_t  fTime;      // Calibrated Arrival Time
 
     Bool_t   fIsSaturated;   // the pixel's low gain is saturated
@@ -30 +29 @@
     Float_t  GetNumPhotons() const       { return fPhot;    }
     Float_t  GetErrorPhot() const        { return fErrPhot; }
-    Float_t  GetTime()      const        { return fTime;    }
     
     Bool_t   IsPixelUsed() const         { return fRing>0; }
@@ -46 +44 @@
     void     SetNumPhotons(Float_t f)    { fPhot    = f; }
     void     SetErrorPhot(Float_t f)     { fErrPhot = f; }
-    void     SetTime    (Float_t f)    { fTime    = f; }
     void     Set(Float_t np, Float_t ep) { fPhot = np; fErrPhot = ep; }
 

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -256 +256 @@
           MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCalibrations)[pixidx];
           MCalibrationQEPix     &qe  = (MCalibrationQEPix&)    (*fQEs         )[pixidx];
-          MBadPixelsPix         &bad = (*fBadPixels)[pixidx];
 
           if (fBadPixels)
-            if (!bad.IsCalibrationResultOK())
-              continue;
-
+            {
+              MBadPixelsPix         &bad = (*fBadPixels)[pixidx];
+              if (!bad.IsCalibrationResultOK())
+                continue;
+            }
+            
           calibConv      = pix.GetMeanConvFADC2Phe();
           calibConvVar   = pix.GetMeanConvFADC2PheVar();