Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3750)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3751)
@@ -24,7 +24,4 @@
        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]
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc	(revision 3750)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc	(revision 3751)
@@ -60,5 +60,6 @@
 //
 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)
 {
 } 
Index: trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h	(revision 3750)
+++ trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h	(revision 3751)
@@ -17,5 +17,4 @@
     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,5 +29,4 @@
     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,5 +44,4 @@
     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; }
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrate.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3750)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3751)
@@ -256,10 +256,12 @@
 	  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();