Changeset 8452

Timestamp:

04/27/07 11:05:11 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• callisto_mux.rc (modified) (1 diff)
• mbadpixels/MBadPixelsPix.h (modified) (2 diffs)
• mcalib/CalibLinkDef.h (modified) (1 diff)
• mcalib/MCalibCalcFromPast.cc (modified) (14 diffs)
• mcalib/MCalibCalcFromPast.h (modified) (2 diffs)
• mcalib/MCalibColorSteer.cc (modified) (12 diffs)
• mcalib/MCalibColorSteer.h (modified) (2 diffs)
• mcalib/MCalibrateData.cc (modified) (8 diffs)
• mcalib/MCalibrateData.h (modified) (2 diffs)
• mcalib/MCalibrationChargeCalc.cc (modified) (44 diffs)
• mcalib/MCalibrationChargeCalc.h (modified) (4 diffs)
• mcalib/MCalibrationChargeCam.cc (modified) (2 diffs)
• mcalib/MCalibrationRelTimeCalc.cc (modified) (10 diffs)
• mcalib/MCalibrationRelTimeCam.cc (modified) (6 diffs)
• mcalib/Makefile (modified) (1 diff)
• mhcalib/MHCalibrationCam.cc (modified) (12 diffs)
• mhcalib/MHCalibrationCam.h (modified) (2 diffs)
• mhcalib/MHCalibrationChargeCam.cc (modified) (21 diffs)
• mhcalib/MHCalibrationRelTimeCam.cc (modified) (14 diffs)
• mhcalib/MHCalibrationRelTimeCam.h (modified) (3 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (7 diffs)
• mjobs/MJCalibration.cc (modified) (11 diffs)
• mjobs/calibrationref.rc (modified) (1 diff)
• mjobs/calibrationref_Dec04.rc (modified) (1 diff)
• mjobs/calibrationref_Nov04.rc (modified) (1 diff)
• resources/calibrationref_mux.rc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2007/04/27 Thomas Bretz
+
+   * mcalib/CalibLinkDef.h, mcalib/Makefile:
+     - removed obsolete MCalibrationIntensityCam 
+     - removed obsolete MCalibrationIntensityChargeCam 
+
+   * mcalib/MCalibCalcFromPast.[h,cc], mcalib/MCalibColorSteer.[h,cc],
+     mcalib/MCalibrateData.[h,cc], mhcalib/MHCalibrationChargeCam.[h,cc]:
+     - removed obsolete MCalibrationIntensityChargeCam and replaced by
+       MCalibrationChargeCam
+
+   * mcalib/MCalibrationChargeCalc.[h,cc]:
+     - removed obsolete MCalibrationIntensityChargeCam and replaced by
+       MCalibrationChargeCam
+     - to realize the difference between continous and single calibration
+       a new data member fContinousCalibration has been introduced
+     - consequently increased version number to 6
+     - do not set any exclusion in ReInit. it is nonsense not to fill 
+       histograms which might give (or give not) correct result,
+       if the checks are all executed anyhow
+
+   * mcalib/MCalibrationRelTimeCalc.cc:
+     - do not set any exclusion in ReInit and if a pixel is unsuitable.
+       it is nonsense not to fill histograms which might give (or give
+       not) correct result, if the checks are all executed anyhow
+     - switched on the check for outliers
+     - outliers are now set unsuitable rather than unreliable
+     - some code simplification of the checks
+
+   * mcalib/MCalibrationChargeCam.cc:
+     - added a comment in the Clear member function
+
+   * mcalib/MCalibrationRelTimeCam.cc:
+     - some fixes of looong Form statements
+     - a small cosmetic change to GetPixelContent
+     - replaced the old check of the average time resolution by
+       a more accurate check using the median and deviation
+
+   * mhcalib/MHCalibrationRelTimeCam.[h,cc]:
+     - removed data member fReferencePixel and corresponding code
+     - use the median of pixels with area index 0 as reference instead of
+       an artificial pixel
+
+   * mhcalib/MHCalibrationCam.[h,cc]:
+     - finally removed all dependencies on the intensity cams and replaced
+       them by the direct cam
+     - if the lo-gain histogram is empty this is not a reason for an 
+       uncalibrated pixel. At least in case of extracted properties (charge
+       and time) it is ok.  
+
+   * mjobs/MJCalibration.cc:
+     - let MCalibrationRelTimeCalc run after MCalibrationChargeCalc
+       otherwise almost all unsuitable pixels have deviating
+       relative arrival resolution.
+     - added new level for deviating time reolution to plot of bad pixels
+     - changed reference lines for timr resolution plots
+     - removed data member fRefTimeOffsetInner, it is now 0 by definition
+
+   * mjobs/MJCalibrateSignal.cc:
+     - finally removed all dependencies of Intensity cams
+     - enable ContinousCalibration in MCalibrationChargeCalc instead
+     - switched on interleaved relative time calibration
+
+   * mbadpixels/MBadPixelsPix.h:
+     - adapted to new unsuitable flag kDeviatingTimeResolution
+
+   * callisto_mux.rc:
+     - removed the obsolete resource statement about the level
+       for the relative arrival time check.
+
+   * mjobs/calibrationref.rc, mjobs/calibrationref_Dec04.rc,
+     mjobs/calibrationref_Nov04.rc, resources/calibrationref_mux.rc:
+     - changed time resolution references accordingly
+
+
+
  2007/04/26 Thomas Bretz
 

trunk/MagicSoft/Mars/NEWS

@@ -56 +56 @@
      helps to get rid of artefacts in histograms. For the signal this
      is not necessray because it is displayed in log-scale anyhow
+
+   - callisto: Fixed a problem with internal exclusions. Pixels which
+     have once been marked as unsuitable didn't get the necessary
+     histograms filled anymore to be rechecked with each interleaved
+     calibration.
+
+   - callisto: The relative arrival time resolution (the rms of the
+     relative arrival time offset) is now checked against its
+     median and the median deviation, instead of the average 
+     plus an absolute offset.
+
+   - callisto: The relative arrival time offset is now calculated
+     w.r.t. its median not w.r.t. to an artificial reference pixel.
+
+   - callisto: The relative time calibration now marks pixels with
+     outlaying offset as unsuitable
+
+   - callisto: The interleaved relative time calibration has been switched
+     on. The advantage is that pixels which are marked as outliers
+     now can recover. An improvement over time is not expected, because
+     the relative time calibration seems stable.
 
    - ganymed: If the dataset file containes "MonteCarlo: Yes" the "-mc"

trunk/MagicSoft/Mars/callisto_mux.rc

@@ -282 +282 @@
 #MJCalibration.MHCalibrationRelTimeCam.PulserFrequency: 500
 
-MJCalibration.MCalibrationRelTimeCalc.RelTimeResolutionLimit: 0.2
-
 # ==========================================================================
 #############################################################################

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -107 +107 @@
       if (IsUncalibrated( kFluctuatingArrivalTimes)) return 8;
       if (IsUncalibrated( kDeviatingNumPhes    ))    return 9;
-      if (IsUncalibrated( kLoGainBlackout      ))    return 10;
-      if (IsUncalibrated( kPreviouslyExcluded  ))    return 11;
-      return 12;
+      if (IsUncalibrated( kDeviatingTimeResolution)) return 10;
+      if (IsUncalibrated( kLoGainBlackout      ))    return 11;
+      if (IsUncalibrated( kPreviouslyExcluded  ))    return 12;
+      return 13;
     }
 
@@ -115 +116 @@
       if (!IsUnreliable() || IsUnsuitable())      return 0;
       if (IsUncalibrated( kChargeSigmaNotValid )) return 1;
-      if (IsUncalibrated( kDeviatingNumPhes    )) return 2;
       if (IsUncalibrated( kHiGainNotFitted     )) return 3;
       if (IsUncalibrated( kLoGainNotFitted     )) return 4;

trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

@@ -16 +16 @@
 #pragma link C++ class MCalibConstCam+;
 #pragma link C++ class MCalibConstPix+;
-
-#pragma link C++ class MCalibrationIntensityCam+;
-#pragma link C++ class MCalibrationIntensityChargeCam+;
 
 #pragma link C++ class MCalibrationCam+;

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.cc

@@ -30 +30 @@
 //  Input Containers:
 //   MParList
-//   MCalibrationIntensityChargeCam
 //
 //  Output Containers:
-//   MCalibrationIntensityChargeCam
 //
 // Class version 2:
@@ -55 +53 @@
 #include "MHCalibrationCam.h"
 
-#include "MCalibrationIntensityChargeCam.h"
-
 #include "MBadPixelsCam.h"
 
 #include "MCalibrationQECam.h"
 #include "MCalibrationBlindCam.h"
+#include "MCalibrationChargeCam.h"
 #include "MCalibrationChargePix.h"
 #include "MCalibrationChargeCalc.h"
@@ -83 +80 @@
 MCalibCalcFromPast::MCalibCalcFromPast(const char *name, const char *title)
     : fGeom(NULL), fParList(NULL), fRunHeader(NULL),
-    fIntensCharge(NULL), fBlindCam(NULL), fQECam(NULL), fBadPixels(NULL),
+    fCharge(NULL), fBlindCam(NULL), fQECam(NULL), fBadPixels(NULL),
     fChargeCalc(NULL), fRelTimeCalc(NULL), fCalibrate(NULL),
     fNumCam(0), fNumEvents(0), fUpdateWithFFactorMethod(kTRUE), fUpdateNumPhes(kTRUE),
@@ -133 +130 @@
 
   //
-  // Look for the MBadPixels Intensity Cam
+  // Look for the MCalibrationQECam
   //
   fQECam = (MCalibrationQECam*)pList->FindObject("MCalibrationQECam");
@@ -143 +140 @@
 
   // 
-  // Look for the MFillH-class "MHCalibrationBlindCam". In case yes, initialize the 
-  // corresponding IntensityCam
+  // Look for the MFillH-class "MHCalibrationBlindCam".
   //
   if (pList->FindObject(AddSerialNumber("MHCalibrationBlindCam")))
@@ -156 +152 @@
 
   //
-  // Look for the MFillH-class "MHCalibrationChargeCam". In case yes, initialize the 
-  // corresponding IntensityCam
+  // Look for the MFillH-class "MHCalibrationChargeCam". 
   //
   if (pList->FindObject(AddSerialNumber("MHCalibrationChargeCam")))
   {
 
-    fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam");
-    if (!fIntensCharge)
-        return kFALSE;
-
-    MCalibrationChargeCam *chargeinit = (MCalibrationChargeCam*)pList->FindObject("MCalibrationChargeCam");
-
-    if (chargeinit)
-      fIntensCharge->SetCam(chargeinit,0);
-    else
-      *fLog << "Could not find initial MCalibrationChargeCam, cannot initialize intensity cam" << endl;
+    fCharge = (MCalibrationChargeCam*)pList->FindCreateObj("MCalibrationChargeCam");
+    if (!fCharge)
+        return kFALSE;
 
     if (!fChargeCalc)
@@ -194 +182 @@
 
   // 
-  // Look for the MFillH name "FillRelTimeCam". In case yes, initialize the 
-  // corresponding IntensityCam
+  // Look for the MFillH name "FillRelTimeCam".
   //
   if (pList->FindObject(AddSerialNumber("MHCalibrationRelTimeCam")))
   {
-    // if (!pList->FindCreateObj("MCalibrationIntensityRelTimeCam"))
-    //    return kFALSE;
-
     if (!fRelTimeCalc)
       fRelTimeCalc   = (MCalibrationRelTimeCalc*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCalc"));
@@ -252 +236 @@
 //
 // - Initializes new containers in the 
-// - Intensity Cams, if the number of calibration events has reach fNumEventsDump. 
+// - if the number of calibration events has reach fNumEventsDump.
 // - Executes Finalize() of the MCalibration*Calc classes in that case.
 // - Sets the latest MCalibrationChargeCam as update class into MCalibrateData
-// - Initialize new MCalibration*Cams into the intensity cams.
+// - clean MCalibration*Cams
 //
 Int_t MCalibCalcFromPast::Process()
@@ -263 +247 @@
 
   // Replace the old cams by (empty) new ones
-  // MCalibrationChargeCam: fIntensCharge
+  // MCalibrationChargeCam: fCharge
   // MCalibrationQECam:     fIntensQE
   // MCalibrationBlindCam:  fIntensBlind
@@ -276 +260 @@
   *fLog << inf << "Finalize calibration histograms:" << endl;
 
-  // This fills the IntensityCam which are newly created by
+  // This fills the Cams which are cleared by
   // ReInitialize with the result of the last calib cycle
   Finalize("MHCalibrationChargeCam");
@@ -299 +283 @@
         if (fUpdateNumPhes)
         {
-          MCalibrationChargePix &avpix =(MCalibrationChargePix&)fIntensCharge->GetCam()->GetAverageArea(0);
+          MCalibrationChargePix &avpix =(MCalibrationChargePix&)fCharge->GetAverageArea(0);
           fPhes   [fNumPhes] = avpix.GetPheFFactorMethod();
           fPhesVar[fNumPhes] = avpix.GetPheFFactorMethodVar();
@@ -329 +313 @@
 
   if (fCalibrate)
-    return fCalibrate->UpdateConversionFactors(fUpdateWithFFactorMethod ? NULL
-                                               : (MCalibrationChargeCam*)fIntensCharge->GetCam() );
+    return fCalibrate->UpdateConversionFactors(fUpdateWithFFactorMethod ? NULL : fCharge);
 
   return kTRUE;
@@ -358 +341 @@
 // --------------------------------------------------------------------------
 //
-// Re-Intitializes new containers inside the Intensity Cams. 
-// From now on, a call to the IntensityCam functions returns pointers 
-// to the newly created Containers.
+// Clear contents of cams
 //
 Bool_t MCalibCalcFromPast::ReInitialize()
@@ -391 +372 @@
   // IF SIMPLE ENOUGH, REMOVE THE FUNCTION!
 
-  if (fIntensCharge)
-  {
-        *fLog << "MCalibrationChargeCam...";
-        MCalibrationChargeCam *cold = (MCalibrationChargeCam*)fIntensCharge->GetCam();
-
-        fIntensCharge->AddToList(Form("MCalibrationChargeCam%04d",fNumCam),*fGeom);
-
-        MCalibrationChargeCam *cnew = (MCalibrationChargeCam*)fIntensCharge->GetCam();
-        cnew->SetRunNumber(runnumber);
-
-        if (cold)
-        {
-            cnew->MergeHiLoConversionFactors(*cold);
-            fIntensCharge->DeleteOldCam(cold);
-        }
+  if (fCharge)
+  {
+      *fLog << "MCalibrationChargeCam...";
+      fCharge->Clear();
+      fCharge->SetRunNumber(runnumber);
   }
 

trunk/MagicSoft/Mars/mcalib/MCalibCalcFromPast.h

@@ -17 +17 @@
 class MCalibrationRelTimeCalc;
 class MCalibrateData;
-class MCalibrationIntensityChargeCam;
+class MCalibrationChargeCam;
 class MCalibrationBlindCam;
 class MCalibrationQECam;
@@ -32 +32 @@
   MParList                        *fParList;         //! Parameter List
   MRawRunHeader                   *fRunHeader;       //! Run header storing the run number
-  MCalibrationIntensityChargeCam  *fIntensCharge;    //! Intensity Charge Cam (to be created)
+  MCalibrationChargeCam           *fCharge;          //! Intensity Charge Cam (to be created)
 
   MCalibrationBlindCam            *fBlindCam;        //! Blind  Cam

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc

@@ -33 +33 @@
 //   MCalibrationPattern
 //   MParList
-//   MCalibrationIntensityChargeCam
 //
 //  Output Containers:
-//   MCalibrationIntensityChargeCam
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -55 +53 @@
 #include "MBadPixelsCam.h"
 
-#include "MCalibrationIntensityChargeCam.h"
-
 #include "MCalibrationPattern.h"
 #include "MCalibrationQECam.h"
@@ -76 +72 @@
 //
 MCalibColorSteer::MCalibColorSteer(const char *name, const char *title)
-    : fCalibPattern(NULL), fGeom(NULL), fParList(NULL), 
-      fIntensCharge(NULL),
+    : fCalibPattern(NULL), fGeom(NULL), fParList(NULL), fCharge(NULL),
       fBad(NULL), fChargeCalc(NULL), fRelTimeCalc(NULL), fHistCopy(kFALSE)
 {
@@ -148 +143 @@
 
   // 
-  // Look for the MFillH name "FillChargeCam". In case yes, initialize the 
-  // corresponding IntensityCam
+  // Look for the MFillH name "FillChargeCam".
   //
   if (pList->FindObject(AddSerialNumber("MHCalibrationChargeCam")))
@@ -155 +149 @@
       *fLog << inf << "Found MHCalibrationChargeCam ... " << flush;
 
-      fIntensCharge = (MCalibrationIntensityChargeCam*)pList->FindCreateObj("MCalibrationIntensityChargeCam");
-      if (!fIntensCharge)
+      fCharge = (MCalibrationChargeCam*)pList->FindCreateObj("MCalibrationChargeCam");
+      if (!fCharge)
           return kFALSE;
 
@@ -172 +166 @@
 
   // 
-  // Look for the MFillH name "FillRelTimeCam". In case yes, initialize the 
-  // corresponding IntensityCam
+  // Look for the MFillH name "FillRelTimeCam".
   //
   if (pList->FindObject(AddSerialNumber("MHCalibrationRelTimeCam")))
@@ -199 +192 @@
 // --------------------------------------------------------------------------
 //
-// Reads the pattern from MCalibrationPattern and initializes new containers in the 
-// Intensity Cams, if the pattern has changed. Executes Finalize of the 
+// Reads the pattern from MCalibrationPattern and clear
+// Cams, if the pattern has changed. Executes Finalize of the
 // MCalibration*Calc classes in that case.
 //
@@ -256 +249 @@
 // --------------------------------------------------------------------------
 //
-// Reads the pattern from MCalibrationPattern and initializes new containers in the 
-// Intensity Cams, if the pattern has changed. Executes Finalize of the 
+// Reads the pattern from MCalibrationPattern and clear
+// Cams, if the pattern has changed. Executes Finalize of the
 // MCalibration*Calc classes in that case.
 //
@@ -290 +283 @@
 
   hist->Finalize();
-  CopyHist(name);
+  //CopyHist(name);
   hist->ResetHists();
   hist->SetColor( fCalibPattern->GetPulserColor());
@@ -298 +291 @@
 // --------------------------------------------------------------------------
 //
-// Re-Intitializes new containers inside the Intensity Cams. 
-// From now on, a call to the IntensityCam functions returns pointers 
-// to the newly created Containers.
+// Clear cams
 //
 Bool_t MCalibColorSteer::ReInitialize()
@@ -310 +301 @@
 
   fBad->Clear(); // FIXME:::::: MERGE PreExcl!!!!
-  fQECam->Clear();
+
+  if (fQECam)
+      fQECam->Clear();
 
   fBlindCam->Clear();
   fBlindCam->SetPulserColor(fCalibPattern->GetPulserColor());
 
-  fRelTimeCam->Clear();
-  fRelTimeCam->SetPulserColor(fCalibPattern->GetPulserColor());
-
-  if (fIntensCharge)
-    {
-      MCalibrationChargeCam *oldcam = (MCalibrationChargeCam*)fIntensCharge->GetCam();
-      fIntensCharge->AddToList(Form("MCalibrationChargeCam%s",namep.Data()),*fGeom);
-      MCalibrationChargeCam *cam    = (MCalibrationChargeCam*)fIntensCharge->GetCam();
-      cam->SetPulserColor(fCalibPattern->GetPulserColor());
-      if (!cam->MergeHiLoConversionFactors(*oldcam))
-          return kFALSE;
-      *fLog << inf << "New MCalibrationChargeCam with name: " << cam->GetName() << endl;
-    }
+  if (fRelTimeCam)
+  {
+      fRelTimeCam->Clear();
+      fRelTimeCam->SetPulserColor(fCalibPattern->GetPulserColor());
+  }
+
+  if (fCharge)
+  {
+      fCharge->Clear();
+      fCharge->SetPulserColor(fCalibPattern->GetPulserColor());
+  }
 
   return kTRUE;
@@ -360 +351 @@
   return result;
 }
-
-// --------------------------------------------------------------------------
-//
-// Copies the histogram classes into the intensity cams
-//
-void MCalibColorSteer::CopyHist(const char* name)
-{
-  MHCalibrationCam *hcam = (MHCalibrationCam*)fParList->FindObject(name);
-  TString n(name);
-  if (n.Contains("ChargeCam"))
-    {
-      if (fIntensCharge)
-          fIntensCharge->AddHist((MHCalibrationCam*)hcam->Clone());
-    }
-//  if (n.Contains("Blind"))
-//    if (fIntensBlind)
-//        fIntensBlind->AddHist((MHCalibrationCam*)hcam->Clone());
-
-//  if (n.Contains("RelTime"))
-//    if (fIntensRelTime)
-//        fIntensRelTime->AddHist((MHCalibrationCam*)hcam->Clone());
-}
-
-// --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.h

@@ -16 +16 @@
 class MRawRunHeader;
 class MCalibrationChargeCalc;
+class MCalibrationChargeCam;
 class MCalibrationRelTimeCalc;
-class MCalibrationIntensityChargeCam;
 class MCalibrationRelTimeCam;
 class MCalibrationBlindCam;
@@ -30 +30 @@
   MGeomCam                        *fGeom;            //!
   MParList                        *fParList;         //!
-  MCalibrationIntensityChargeCam  *fIntensCharge;    //!
+  MCalibrationChargeCam           *fCharge;          //!
   MCalibrationRelTimeCam          *fRelTimeCam;      //!
   MCalibrationBlindCam            *fBlindCam;        //!
   MCalibrationQECam               *fQECam;           //!
   MBadPixelsCam                   *fBad;             //!
-  
+
   MCalibrationChargeCalc          *fChargeCalc;      //!
   MCalibrationRelTimeCalc         *fRelTimeCalc;     //!
-                                                     
+
   MCalibrationCam::PulserColor_t   fColor;
   Float_t                          fStrength;
 
   Bool_t                           fHistCopy;        // Decide whether MHCalibrationCams will get copied
-  
+
   Int_t  PreProcess(MParList *pList);
   Int_t  Process();
   Int_t  PostProcess();
-  
+
   Bool_t ReInitialize();
   Bool_t Finalize(const char* name);
 
-  void    CopyHist(const char* name);
+  //void    CopyHist(const char* name);
   TString GetNamePattern();
-  
+
 public:
     MCalibColorSteer(const char *name=NULL, const char *title=NULL);

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.67 2007-04-20 11:48:08 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrateData.cc,v 1.68 2007-04-27 10:04:46 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -114 +114 @@
 #include "MPedestalPix.h"
 
-#include "MCalibrationIntensityChargeCam.h"
 #include "MCalibrationChargeCam.h"
 #include "MCalibrationChargePix.h"
@@ -155 +154 @@
 //
 MCalibrateData::MCalibrateData(CalibrationMode_t calmode,const char *name, const char *title) 
-    : fGeomCam(NULL),   fBadPixels(NULL), fCalibrations(NULL), fIntensCalib(NULL),
+    : fGeomCam(NULL),   fBadPixels(NULL), fCalibrations(NULL),
       fQEs(NULL), fSignals(NULL), fCerPhotEvt(NULL), fCalibConstCam(NULL),
     fPedestalFlag(kNo), fSignalType(kPhot), fRenormFactor(1.), fScaleFactor(1.)
@@ -238 +237 @@
     if (fCalibrationMode>kNone)
     {
-        fIntensCalib = (MCalibrationIntensityChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityChargeCam"));
-        if (fIntensCalib)
-          *fLog << inf << "Found MCalibrationIntensityChargeCam ... " << endl;
-
         fCalibrations = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
         if (!fCalibrations)
@@ -465 +460 @@
     if (fCalibrationMode > kNone)
     {
-
-        const MCalibrationCam *chargecam = fIntensCalib ? fIntensCalib->GetCam() : fCalibrations;
-        if (chargecam->GetSize() != npixels)
+        if (fCalibrations->GetSize() != npixels)
         {
             *fLog << "Size mismatch between MGeomCam and MCalibrationChargeCam... abort!" << endl;
@@ -478 +471 @@
             return kFALSE;
         }
-      }
-    
+    }
+
     fCalibConsts  .Set(npixels);
     fCalibFFactors.Set(npixels);
@@ -512 +505 @@
     fHiLoConv.Reset();
     fHiLoConvErr.Reset();
-
-    MCalibrationChargeCam *chargecam = NULL;
-    if (updatecam)
-        chargecam = fCalibrations;
-    else
-        chargecam = fIntensCalib ? (MCalibrationChargeCam*)fIntensCalib->GetCam() : fCalibrations;
 
     //
@@ -546 +533 @@
              }
             
-            const MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[pixidx];
-            const MCalibrationChargePix &avpix = (MCalibrationChargePix&)chargecam->GetAverageArea(0);
+            const MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*fCalibrations)[pixidx];
+            const MCalibrationChargePix &avpix = (MCalibrationChargePix&)fCalibrations->GetAverageArea(0);
 
             hiloconv   = pix.GetConversionHiLo     ();
             hiloconverr= pix.GetConversionHiLoSigma();
-            
+
             calibConv    = pix.GetMeanConvFADC2Phe();
             calibConvVar = pix.GetMeanConvFADC2PheVar();
             calibFFactor = pix.GetMeanFFactorFADC2Phot();
-            
+
             const MCalibrationQEPix &qe = (MCalibrationQEPix&)(*fQEs)[pixidx];
 

trunk/MagicSoft/Mars/mcalib/MCalibrateData.h

@@ -20 +20 @@
 class MCalibrationChargeCam;
 class MCalibrationQECam;
-
-class MCalibrationIntensityChargeCam;
 
 class MCalibrateData : public MTask
@@ -63 +61 @@
   MBadPixelsCam                  *fBadPixels;     //! Bad Pixels information
   MCalibrationChargeCam          *fCalibrations;  //! Calibration constants
-  MCalibrationIntensityChargeCam *fIntensCalib;   //! Calibration constants from interlaced calib.
   MCalibrationQECam              *fQEs;           //! Quantum efficiencies
   MExtractedSignalCam            *fSignals;       //! Integrated charge in FADCs counts

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.176 2007-04-20 13:21:11 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.177 2007-04-27 10:04:46 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -200 +200 @@
 //   -  TString fOutputFile
 //
+//  ClassVersion 6:
+//   -  Bool_t fContinousCalibration
+//
 //////////////////////////////////////////////////////////////////////////////
 #include "MCalibrationChargeCalc.h"
@@ -220 +223 @@
 #include "MPedestalCam.h"
 #include "MPedestalPix.h"
-
-#include "MCalibrationIntensityChargeCam.h"
 
 #include "MHCalibrationChargeCam.h"
@@ -362 +363 @@
 
     fBadPixels   = NULL;
-    fIntensCam   = NULL;
     fCam         = NULL;
     fHCam        = NULL;
@@ -440 +440 @@
 // Search for the following input containers and abort if not existing:
 //  - MGeomCam
-// -  MCalibrationIntensityChargeCam or MCalibrationChargeCam
+// -  MCalibrationChargeCam
 //  - MCalibrationQECam
 //  - MBadPixelsCam
@@ -455 +455 @@
 // It defines the PixId of every pixel in:
 //
-// - MCalibrationIntensityChargeCam 
 // - MCalibrationChargeCam 
 // - MCalibrationQECam
@@ -495 +494 @@
   
     //
-    // Intensity containers
+    // MCalibrationChargeCam
     //
-  fIntensCam = (MCalibrationIntensityChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityChargeCam"));
-  if (fIntensCam)
-    *fLog << inf << "Found MCalibrationIntensityChargeCam... " << flush;
-  else
-    {
-      fCam = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
-      if (!fCam)
-        {
-          *fLog << err << "Cannot find MCalibrationChargeCam ... abort." << endl;
-          *fLog << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl;
-          return kFALSE;
-        }
-    }
-  
+  fCam = (MCalibrationChargeCam*)pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
+  if (!fCam)
+  {
+      *fLog << err << "Cannot find MCalibrationChargeCam ... abort." << endl;
+      *fLog << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl;
+      return kFALSE;
+  }
+
   //
   // Blind pixel calibration
@@ -550 +543 @@
   // Further initialization
   //
-  MCalibrationChargeCam *chargecam = fIntensCam 
-    ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-
-  const UInt_t npixels = fGeom->GetNumPixels();
-  
-  for (UInt_t i=0; i<npixels; i++)
-    {
-
-      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i];
-
-      if ((*fBadPixels)[i].IsBad())
-      {
-          MCalibrationQEPix &pqe = (MCalibrationQEPix&)(*fQECam)[i];
-          pix.SetExcluded();
-          pqe.SetExcluded();
-          continue;
-      }
-
-      if (IsDebug())
-        pix.SetDebug();
-    }
+  if (IsDebug())
+  {
+      const UInt_t npixels = fGeom->GetNumPixels();
+      for (UInt_t i=0; i<npixels; i++)
+          (*fCam)[i].SetDebug();
+  }
 
   fResultFlags.Set(fGeom->GetNumAreas());
@@ -606 +584 @@
   // Now retrieve the colour and check if not various colours have been used
   //
-  if (!fIntensCam)
-    {
-      if (fPulserColor != MCalibrationCam::kNONE)
-        {
-          *fLog << warn << "Multiple colours used simultaneously!" << flush;
-          fHCam->Finalize();
-          if (fHBlindCam)
-            fHBlindCam->Finalize();
-
-          Finalize();
-
-          fHCam->ResetHists();
-          if (fHBlindCam)
-            fHBlindCam->ResetHists();
-
-          *fLog << inf << "Starting next calibration... " << flush;
-
-          fHCam->SetColor(col);
-          if (fHBlindCam)
-            fHBlindCam->SetColor(col);
-
-          fCam->SetPulserColor(col);
-          if (fBlindCam)
-            fBlindCam->SetPulserColor(col);
-        }
-    }
+  if (!fContinousCalibration && fPulserColor != MCalibrationCam::kNONE)
+  {
+      *fLog << warn << "Multiple colours used simultaneously!" << flush;
+      fHCam->Finalize();
+      if (fHBlindCam)
+          fHBlindCam->Finalize();
+
+      Finalize();
+
+      fHCam->ResetHists();
+      if (fHBlindCam)
+          fHBlindCam->ResetHists();
+
+      *fLog << inf << "Starting next calibration... " << flush;
+
+      fHCam->SetColor(col);
+      if (fHBlindCam)
+          fHBlindCam->SetColor(col);
+
+      fCam->SetPulserColor(col);
+      if (fBlindCam)
+          fBlindCam->SetPulserColor(col);
+  }
 
   //
@@ -655 +630 @@
   // Distribute new color to all containers
   //
+  fCam->SetPulserColor(col);
+  if (fBlindCam)
+    fBlindCam->SetPulserColor(col);
+
   fHCam->SetColor(col);
   if (fHBlindCam)
     fHBlindCam->SetColor(col);
-
-  MCalibrationChargeCam *chargecam = fIntensCam 
-    ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-
-  chargecam->SetPulserColor(col);
-
-  if (fBlindCam)
-    fBlindCam->SetPulserColor(col);
   if (fPINDiode)
     fPINDiode->SetColor(col);
@@ -724 +695 @@
 // Call  FinalizeUnsuitablePixels()
 //  
-// Call MParContainer::SetReadyToSave() for fIntensCam, fCam, fQECam, fBadPixels and 
-//                                          fBlindCam and fPINDiode if they exist
+// Call MParContainer::SetReadyToSave() for fCam, fQECam, fBadPixels and
+//      fBlindCam and fPINDiode if they exist
 //
 // Print out some statistics
@@ -749 +720 @@
       }
 
-  MCalibrationChargeCam *chargecam = fIntensCam   ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-
   //
   // First loop over pixels, call FinalizePedestals and FinalizeCharges
@@ -759 +728 @@
     {
 
-      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[pixid];
+      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[pixid];
       //
       // Check if the pixel has been excluded from the fits
@@ -786 +755 @@
   if (nvalid == 0)
   {
-    if (!fIntensCam)
+      if (!fContinousCalibration)
       {
         *fLog << warn << GetDescriptor() << ": All pixels have non-valid calibration. " 
@@ -801 +770 @@
 
       const MPedestalPix    &ped = fPedestals->GetAverageArea(aidx);
-      MCalibrationChargePix &pix = (MCalibrationChargePix&)chargecam->GetAverageArea(aidx);
+      MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageArea(aidx);
       const MArrayI &arr         = fHCam->GetAverageAreaNum();
 
@@ -814 +783 @@
       pix.SetSigma (pix.GetSigma()/pix.GetFFactorFADC2Phe());
 
-      FinalizeCharges(pix, chargecam->GetAverageBadArea(aidx),"area id");
-      FinalizeArrivalTimes(pix, chargecam->GetAverageBadArea(aidx), "area id");
+      FinalizeCharges(pix, fCam->GetAverageBadArea(aidx),"area id");
+      FinalizeArrivalTimes(pix, fCam->GetAverageBadArea(aidx), "area id");
     }
   
@@ -825 +794 @@
       const MPedestalPix     &ped = fPedestals->GetAverageSector(sector);
 
-      MCalibrationChargePix &pix = (MCalibrationChargePix&)chargecam->GetAverageSector(sector);
+      MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageSector(sector);
       FinalizePedestals(ped,pix, 0);
     }
@@ -840 +809 @@
   //
   if (FinalizeFFactorMethod())
-    chargecam->SetFFactorMethodValid(kTRUE);
+    fCam->SetFFactorMethodValid(kTRUE);
   else
     {
       *fLog << warn << "Could not calculate the photons flux from the F-Factor method " << endl;
-      chargecam->SetFFactorMethodValid(kFALSE); 
-      if (!fIntensCam)
-        return kFALSE;
+      fCam->SetFFactorMethodValid(kFALSE);
+      if (!fContinousCalibration)
+          return kFALSE;
     }
 
@@ -916 +885 @@
                     "Deviating F-Factor:                     ");
 
-  chargecam->SetReadyToSave();
-  fQECam    ->SetReadyToSave();
+  fCam->SetReadyToSave();
+  fQECam->SetReadyToSave();
   fBadPixels->SetReadyToSave();
 
@@ -1109 +1078 @@
   if (!cal.CalcConvFFactor())
     {
-      *fLog << warn << desc << "Could not calculate the Conv. FADC counts to Phes" << endl;
+      *fLog << warn << desc << "Could not calculate the conv. FADC cts to phes" << endl;
       bad.SetUncalibrated(MBadPixelsPix::kDeviatingNumPhes);
       return kFALSE;
@@ -1149 +1118 @@
 // - MBadPixelsPix::kLoGainOverFlow
 //
-// - Call MCalibrationPix::SetExcluded() for the bad pixels
-//
 // Sets pixel to MBadPixelsPix::kUnreliableRun, if one of the following flags is set:
 // - MBadPixelsPix::kChargeSigmaNotValid 
@@ -1176 +1143 @@
             bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
         }
-      
+
       if (IsCheckDeviatingBehavior())
         {
@@ -1182 +1149 @@
             bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
         }
-      
+
       if (IsCheckHistOverflow())
         {
           if (bad.IsUncalibrated( MBadPixelsPix::kHiGainOverFlow   ))
             bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
-          
+
           if (bad.IsUncalibrated( MBadPixelsPix::kLoGainOverFlow   ))
             bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
         }
-      
+
       if (IsCheckArrivalTimes())
         {
@@ -1235 +1202 @@
 Bool_t MCalibrationChargeCalc::FinalizeFFactorMethod()
 {
-  MCalibrationChargeCam *chargecam = fIntensCam 
-    ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-
   const Int_t npixels  = fGeom->GetNumPixels();
   const Int_t nareas   = fGeom->GetNumAreas();
@@ -1260 +1224 @@
   for (Int_t i=0; i<npixels; i++)
     {
-      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i];
+      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i];
 
       MBadPixelsPix &bad = (*fBadPixels)[i];
@@ -1385 +1349 @@
     {
       
-      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i];
+      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i];
 
       if (!pix.IsFFactorMethodValid())
@@ -1440 +1404 @@
     {
 
-      MCalibrationChargePix &apix = (MCalibrationChargePix&)chargecam->GetAverageArea(aidx);
+      MCalibrationChargePix &apix = (MCalibrationChargePix&)fCam->GetAverageArea(aidx);
 
       if (numareavalid[aidx] == 1)
@@ -1495 +1459 @@
         }
       
-      MCalibrationChargePix &spix = (MCalibrationChargePix&)chargecam->GetAverageSector(sector);
+      MCalibrationChargePix &spix = (MCalibrationChargePix&)fCam->GetAverageSector(sector);
 
       if (sectorweights[sector] < 0. || sectorphes[sector] <= 0.)
@@ -1524 +1488 @@
     {
       
-      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i];
+      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i];
 
       MBadPixelsPix &bad = (*fBadPixels)[i];
@@ -1534 +1498 @@
         {
           const Int_t            aidx = (*fGeom)[i].GetAidx();
-          MCalibrationChargePix &apix = (MCalibrationChargePix&)chargecam->GetAverageArea(aidx);
+          MCalibrationChargePix &apix = (MCalibrationChargePix&)fCam->GetAverageArea(aidx);
 
           pix.SetPheFFactorMethod   ( apix.GetPheFFactorMethod()    );
@@ -1726 +1690 @@
     }
   
-  MCalibrationChargeCam *chargecam = fIntensCam 
-    ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-
-  MCalibrationChargePix &avpix = (MCalibrationChargePix&)chargecam->GetAverageArea(0);
+  MCalibrationChargePix &avpix = (MCalibrationChargePix&)fCam->GetAverageArea(0);
   MCalibrationQEPix     &qepix = (MCalibrationQEPix&)    fQECam->GetAverageArea(0);
 
@@ -1757 +1718 @@
   // Set the results in the MCalibrationChargeCam
   //
-  chargecam->SetNumPhotonsFFactorMethod (avphotons);
+  fCam->SetNumPhotonsFFactorMethod (avphotons);
 
   if (avphotrelvar > 0.)
-    chargecam->SetNumPhotonsFFactorMethodErr(TMath::Sqrt( avphotrelvar * avphotons * avphotons));  
+    fCam->SetNumPhotonsFFactorMethodErr(TMath::Sqrt( avphotrelvar * avphotons * avphotons));
 
   TArrayF lowlim           (nareas);
@@ -1775 +1736 @@
     {
       
-      MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[i];
-      MCalibrationQEPix     &qpix  = (MCalibrationQEPix&)    (*fQECam)   [i];
+      MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*fCam)[i];
+      MCalibrationQEPix     &qpix  = (MCalibrationQEPix&)    (*fQECam)[i];
 
       MBadPixelsPix &bad = (*fBadPixels)[i];
@@ -1895 +1856 @@
     {
       
-      MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[i];
-
+      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i];
       MBadPixelsPix &bad = (*fBadPixels)[i];
 
@@ -1920 +1880 @@
     {
       
-      MCalibrationChargePix &pix  = (MCalibrationChargePix&)(*chargecam)[i];
-      MCalibrationQEPix     &qpix = (MCalibrationQEPix&)    (*fQECam)   [i];
+      MCalibrationChargePix &pix  = (MCalibrationChargePix&)(*fCam)[i];
+      MCalibrationQEPix     &qpix = (MCalibrationQEPix&)(*fQECam)[i];
 
       if ((*fBadPixels)[i].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
@@ -1957 +1917 @@
     return;
 
-  MCalibrationChargeCam *chargecam = fIntensCam
-    ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-
-
   //
   // Set the results in the MCalibrationChargeCam
@@ -1969 +1925 @@
       const Float_t photons = fBlindCam->GetFluxInsidePlexiglass() * (*fGeom)[0].GetA()
                            / fQECam->GetPlexiglassQE();
-      chargecam->SetNumPhotonsBlindPixelMethod(photons);
+      fCam->SetNumPhotonsBlindPixelMethod(photons);
           
       const Float_t photrelvar = fBlindCam->GetFluxInsidePlexiglassRelVar()
@@ -1975 +1931 @@
  
       if (photrelvar > 0.)
-        chargecam->SetNumPhotonsBlindPixelMethodErr(TMath::Sqrt( photrelvar * photons * photons));  
+        fCam->SetNumPhotonsBlindPixelMethodErr(TMath::Sqrt( photrelvar * photons * photons));
     }
   
@@ -2002 +1958 @@
         }
       
-      MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[i];
-      MGeomPix              &geo   =                         (*fGeom)    [i];
+      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i];
+      MGeomPix &geo = (*fGeom)[i];
 
       const Float_t qe        = pix.GetPheFFactorMethod() 
@@ -2046 +2002 @@
   const UInt_t npixels  = fGeom->GetNumPixels();
 
-  MCalibrationChargeCam *chargecam = fIntensCam 
-    ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-
   if (!fPINDiode)
     return;
@@ -2080 +2033 @@
           continue;
         }
-      
-      MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[i];
-      MGeomPix              &geo =                           (*fGeom)    [i];
-      
-      const Float_t qe       =  pix.GetPheFFactorMethod() 
+
+      MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i];
+      MGeomPix &geo = (*fGeom)[i];
+
+      const Float_t qe       =  pix.GetPheFFactorMethod()
                                / fPINDiode->GetFluxOutsidePlexiglass() 
                                / geo.GetA();
@@ -2129 +2082 @@
 //
 // - Print out statistics about BadPixels of type UnsuitableType_t 
-// - store numbers of bad pixels of each type in fCam or fIntensCam
+// - store numbers of bad pixels of each type in fCam
 //
 Bool_t MCalibrationChargeCalc::FinalizeUnsuitablePixels()
@@ -2143 +2096 @@
   TArrayI unsuit(nareas);
   TArrayI unrel(nareas);
-
-  MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam;
 
   Int_t unsuitcnt=0;
@@ -2159 +2110 @@
       unrelcnt    += unrel[aidx];
 
-      chargecam->SetNumUnsuitable(unsuit[aidx], aidx);
-      chargecam->SetNumUnreliable(unrel[aidx],  aidx);
+      fCam->SetNumUnsuitable(unsuit[aidx], aidx);
+      fCam->SetNumUnreliable(unrel[aidx],  aidx);
   }
 
   TArrayI counts(nareas);
-  for (Int_t i=0; i<chargecam->GetSize(); i++)
+  for (Int_t i=0; i<fCam->GetSize(); i++)
   {
-      MCalibrationPix &pix = (*chargecam)[i];
+      const MCalibrationPix &pix = (*fCam)[i];
       if (pix.IsHiGainSaturation())
       {

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h

@@ -23 +23 @@
 class MCalibrationChargePINDiode;
 class MHCalibrationChargeBlindCam;
-class MCalibrationIntensityBlindCam;
 class MCalibrationBlindCam;
 class MCalibrationChargePix;
-class MCalibrationIntensityChargeCam;
 class MCalibrationChargeCam;
 class MHCalibrationChargeCam;
@@ -81 +79 @@
 
   Int_t   fNumProcessed;                       // Number of processed events (for Intensity calibration)
-  
+
+  Bool_t fContinousCalibration;
+
   // Pointers
 //  MBadPixelsIntensityCam         *fIntensBad;      //!  Bad Pixels
   MBadPixelsCam                  *fBadPixels;      //!  Bad Pixels
-  MCalibrationIntensityChargeCam *fIntensCam;      //!  Intensity Calibration results of all pixels   
   MCalibrationChargeCam          *fCam;            //!  Calibrated Charges results of all pixels
   MHCalibrationChargeCam         *fHCam;           //!  Charges histograms of all pixels   
-  MCalibrationIntensityBlindCam  *fIntensBlind;    //!  Intensity Calibration results of the Blind Pixels
   MCalibrationBlindCam           *fBlindCam;       //!  Calibrated Charges of the Blind Pixels
   MHCalibrationChargeBlindCam    *fHBlindCam;      //!  Charges histograms of the Blind Pixels  
@@ -198 +196 @@
   void SetUseExternalNumPhes(const Bool_t b=kTRUE)     { b ? SETBIT(fFlags, kUseExternalNumPhes)         : CLRBIT(fFlags, kUseExternalNumPhes); }
 
+  void SetContinousCalibration(const Bool_t b=kTRUE)   { fContinousCalibration = b; }
+
   // pointers
   void SetPedestals(MPedestalCam *cam) { fPedestals=cam; }
@@ -217 +217 @@
   void SetPheErrUpperLimit     ( const Float_t f=fgPheErrUpperLimit       ) { fPheErrUpperLimit  = f;    }    
   void SetPulserColor          ( const MCalibrationCam::PulserColor_t col ) { fPulserColor       = col;  }
-  
-  ClassDef(MCalibrationChargeCalc, 5)   // Task calculating Calibration Containers and Quantum Efficiencies
+
+  ClassDef(MCalibrationChargeCalc, 6)   // Task calculating Calibration Containers and Quantum Efficiencies
 };
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.69 2006-10-17 17:18:40 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.70 2007-04-27 10:04:46 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -216 +216 @@
 void MCalibrationChargeCam::Clear(Option_t *o)
 {
-
+  // DO NOT RESET THE HI-/LO-GAIN CONSTANTS
   SetFFactorMethodValid    ( kFALSE );
 
-  fNumPhotonsBlindPixelMethod    = 0.; 
-  fNumPhotonsFFactorMethod       = 0.; 
-  fNumPhotonsPINDiodeMethod      = 0.; 
-  fNumPhotonsBlindPixelMethodErr = 0.; 
-  fNumPhotonsFFactorMethodErr    = 0.;  
-  fNumPhotonsPINDiodeMethodErr   = 0.;  
+  fNumPhotonsBlindPixelMethod    = 0.;
+  fNumPhotonsFFactorMethod       = 0.;
+  fNumPhotonsPINDiodeMethod      = 0.;
+  fNumPhotonsBlindPixelMethodErr = 0.;
+  fNumPhotonsFFactorMethodErr    = 0.;
+  fNumPhotonsPINDiodeMethodErr   = 0.;
 
   MCalibrationCam::Clear();
-
-  return;
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -64 +64 @@
 #include "MLogManip.h"
 
+#include "MMath.h"
+
 #include "MParList.h"
 
@@ -81 +83 @@
 using namespace std;
 
-const Float_t MCalibrationRelTimeCalc::fgRelTimeResolutionLimit = 0.05;
+const Float_t MCalibrationRelTimeCalc::fgRelTimeResolutionLimit = 5.0;
 
 // --------------------------------------------------------------------------
 //
-// Default constructor. 
+// Default constructor.
 //
 // Sets all pointers to NULL
@@ -98 +100 @@
     : fGeom(NULL), fFlags(0)
 {
-        
+
   fName  = name  ? name  : "MCalibrationRelTimeCalc";
   fTitle = title ? title : "Task to finalize the relative time calibration";
 
   SetCheckFitResults       ( kFALSE );
-  SetCheckDeviatingBehavior( kFALSE );
+  SetCheckDeviatingBehavior( kTRUE  );
   SetCheckHistOverflow     ( kFALSE );
   SetCheckOscillations     ( kFALSE );
@@ -164 +166 @@
   }
 
-  const UInt_t npixels = fGeom->GetNumPixels();
-  for (UInt_t i=0; i<npixels; i++)
+  if (IsDebug())
   {
-      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i];
-
-      if ((*fBadPixels)[i].IsBad())
-      {
-          pix.SetExcluded();
-          continue;
-      }
-
-      if (IsDebug())
-          pix.SetDebug();
+      const UInt_t npixels = fGeom->GetNumPixels();
+      for (UInt_t i=0; i<npixels; i++)
+          (*fCam)[i].SetDebug();
   }
 
@@ -233 +227 @@
 
   PrintUncalibrated(MBadPixelsPix::kDeviatingTimeResolution,    
-                    Form("%s%2.1f%s","Time resol. less than ", fRelTimeResolutionLimit, " FADC sl. from Mean:"));
+                    Form("%s%2.1f%s","Time resol. less than ", fRelTimeResolutionLimit, " med-dev from median:"));
   PrintUncalibrated(MBadPixelsPix::kRelTimeOscillating,   
                     "Pixels with changing Rel. Times over time:");
@@ -245 +239 @@
 // ----------------------------------------------------------------------------------------------------
 //
-//
-// First loop: Calculate a mean and mean RMS of time resolution per area index 
-//             Include only pixels which are not MBadPixelsPix::kUnsuitableRun or 
-//             MBadPixelsPix::kUnreliableRun (see FinalizeBadPixels())
-//              
-// Second loop: Exclude those deviating by more than fRelTimeResolutionLimit FADC slices
-//              from the mean (obtained in first loop). Set 
-//              MBadPixelsPix::kDeviatingTimeResolution if excluded.
-// 
+// Check for outliers. They are marked with
+// MBadPixelsPix::kDeviatingTimeResolution
+//
 void MCalibrationRelTimeCalc::FinalizeRelTimes()
 {
-
-  const UInt_t npixels  = fGeom->GetNumPixels();
-  const UInt_t nareas   = fGeom->GetNumAreas();
-
-  TArrayF lowlim       (nareas);
-  TArrayF upplim       (nareas);
-  TArrayF areasum      (nareas);
-  TArrayI numareavalid (nareas);
-  TArrayI useunreliable(nareas);
-
-  //
-  // Apero loop: Count number of unreliable pixels:
-  //     
-  for (UInt_t i=0; i<npixels; i++)
-    {
-      MBadPixelsPix &bad = (*fBadPixels)[i];
-      const Int_t  aidx  = (*fGeom)[i].GetAidx();
-
-      if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
-        continue;
-
-      if (bad.IsUnsuitable(MBadPixelsPix::kUnreliableRun))
-        continue;
-
-      numareavalid[aidx] ++;
-    }
-
-  for (UInt_t aidx=0; aidx<nareas; aidx++)
-    if (numareavalid[aidx] < 100)
-      useunreliable[aidx] = 1;
-
-  numareavalid.Reset();
-  //
-  // First loop: Get mean time resolution the RMS
-  //             The loop is only to recognize later pixels with very deviating numbers
-  //
-  for (UInt_t i=0; i<npixels; i++)
-    {
-
-      const MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i];
-
-      if (pix.IsExcluded())
-        continue;
-
-      MBadPixelsPix &bad = (*fBadPixels)[i];
-      if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
-        continue;
-
-      const Int_t   aidx  = (*fGeom)[i].GetAidx();
-
-      if (!useunreliable[aidx])
-        if (bad.IsUnsuitable(MBadPixelsPix::kUnreliableRun))
-          continue;
-
-      const Float_t res   = pix.GetTimePrecision();
-
-      areasum     [aidx] += res;
-      //      areasum2    [aidx] += res*res;
-      numareavalid[aidx] ++;
-    }
-
-
-  for (UInt_t aidx=0; aidx<nareas; aidx++)
-    {
-      if (numareavalid[aidx] < 20)
+    const Int_t npixels = fGeom->GetNumPixels();
+    const Int_t nareas  = fGeom->GetNumAreas();
+
+    // Create an array capable of holding all pixels
+    TArrayF arr(npixels);
+
+    for (Int_t aidx=0; aidx<nareas; aidx++)
+    {
+        Int_t n = 0;
+        for (Int_t i=0; i<npixels; i++)
         {
-          *fLog << warn << "Area   " << setw(4) << aidx << ": Less than 20 pixels with valid time resolution found." << endl;
-          continue;
+            // Check for this aidx only
+            if ((*fGeom)[i].GetAidx()!=aidx)
+                continue;
+
+            // check if pixel may not contain a valid value
+            if ((*fBadPixels)[i].IsUnsuitable())
+                continue;
+
+            // check if it was excluded for some reason
+            const MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i];
+            if (pix.IsExcluded())
+                continue;
+
+            // if TimePrecision is valid fill it into array
+            if (pix.GetTimePrecision()>0)
+                arr[n++] = pix.GetTimePrecision();
         }
 
-      // Calculate the rms out of sum2:
-      /*
-      areasum2[aidx]  = (areasum2[aidx] - areasum[aidx]*areasum[aidx]/numareavalid[aidx]);
-      areasum2[aidx] /= (numareavalid[aidx]-1.);
-      */
-      areasum [aidx] /= numareavalid[aidx];
-      lowlim  [aidx]  = 0;
-      upplim  [aidx]  = areasum [aidx] + fRelTimeResolutionLimit;
-
-    }
-  *fLog << endl;  
-
-
-  for (UInt_t i=0; i<npixels; i++)
-    {
-
-      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i];
-
-      if (pix.IsExcluded())
-        continue;
-
-      MBadPixelsPix &bad = (*fBadPixels)[i];
-      if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
-        continue;
-
-      const Float_t res    = pix.GetTimePrecision();
-      const Int_t   aidx   = (*fGeom)[i].GetAidx();
-
-      if ( res < lowlim[aidx] || res > upplim[aidx] )
+        // Check the ratio of valid entries to the ratio of pixels
+        const Float_t ratio = 100*n/fGeom->GetNumPixWithAidx(aidx);
+        if (3*ratio<2)
+            *fLog << warn << "Area   " << setw(4) << aidx << ": Only " << ratio << "% pixels with valid time resolution found." << endl;
+
+        // Calculate median and median deviation
+        Double_t med;
+        const Double_t dev = MMath::MedianDev(n, arr.GetArray(), med);
+
+        // Now find the outliers
+        for (Int_t i=0; i<npixels; i++)
         {
-            *fLog << warn << "Pixel  " << setw(4) << i << ": Deviating time resolution: "
-                << Form("%4.2f",res) << " out of range ["
-                << Form("%4.2f,%4.2f",lowlim[aidx],upplim[aidx]) << "]" << endl;
-          bad.SetUncalibrated( MBadPixelsPix::kDeviatingTimeResolution);
-          pix.SetExcluded();
+            // Search only within this aidx
+            if ((*fGeom)[i].GetAidx()!=aidx)
+                continue;
+
+            // skip pixels already known to be unsuitable
+            if ((*fBadPixels)[i].IsUnsuitable())
+                continue;
+
+            // check if a pixel has been excluded. This
+            const MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i];
+
+            // Check if time precision is valid (might be invalid
+            // for example in cae of empty histograms)
+            const Float_t res = pix.GetTimePrecision();
+            if (res<0) //FIXME!!! How does this happen?
+            {
+                *fLog << warn << "Pixel  " << setw(4) << i << ": Time resolution not calculated." << endl;
+                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingTimeResolution);
+                continue;
+            }
+
+            // Now compare to a lower and upper limit
+            const Float_t lolim = TMath::Max(med-fRelTimeResolutionLimit*dev, 0.);
+            const Float_t hilim = TMath::Max(med+fRelTimeResolutionLimit*dev, 0.);
+
+            if (res<=lolim || res>=hilim)
+            {
+                *fLog << warn << "Pixel  " << setw(4) << i << ": Deviating time resolution: "
+                    << Form("%4.2f", res) << " out of range "
+                    << Form("[%4.2f,%4.2f]", lolim, hilim) << endl;
+
+                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingTimeResolution);
+            }
         }
     }
@@ -373 +330 @@
 // - MBadPixelsPix::kRelTimeRelErrNotValid 
 //
-// - Call MCalibrationPix::SetExcluded() for the bad pixels
-//
 void MCalibrationRelTimeCalc::FinalizeBadPixels()
 {
@@ -380 +335 @@
   for (Int_t i=0; i<fBadPixels->GetSize(); i++)
     {
-
       MBadPixelsPix &bad = (*fBadPixels)[i];
 
       if (IsCheckDeviatingBehavior())
           if (bad.IsUncalibrated(MBadPixelsPix::kDeviatingTimeResolution))
-              bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun);
+              bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
 
       if (IsCheckFitResults())
@@ -394 +348 @@
           if (bad.IsUncalibrated(MBadPixelsPix::kRelTimeOscillating))
               bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun);
-
-      if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
-      {
-          MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i];
-          pix.SetExcluded();
-      }
     }
 
@@ -460 +408 @@
 void MCalibrationRelTimeCalc::PrintUncalibrated(const char *text, Int_t in, Int_t out) const
 {
-    *fLog << " " << setfill(' ') << setw(56) << setiosflags(ios::left) << text;
+    *fLog << " " << setfill(' ') << setw(48) << setiosflags(ios::left) << text;
     *fLog << " Inner: " << Form("%3i", in);
     *fLog << " Outer: " << Form("%3i", out);

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCam.cc

@@ -131 +131 @@
   *fLog << all << GetDescriptor() << ":" << endl;
   int id = 0;
-  
+
   *fLog << all << "Calibrated pixels:" << endl;
   *fLog << all << endl;
@@ -138 +138 @@
   MCalibrationRelTimePix *pix;
   while ((pix=(MCalibrationRelTimePix*)Next()))
-    {
-      
-      if (!pix->IsExcluded()) 
-        {                            
-
-          *fLog << all 
-                << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Pix  ",pix->GetPixId(),
-                        ":            Offset: ",pix->GetTimeOffset()," +- ",pix->GetTimeOffsetErr(),
-                        "   Precision: ",pix->GetTimePrecision()," +- ",pix->GetTimePrecisionErr())
-                << endl;
+  {
+      if (!pix->IsExcluded())
+      {
+          *fLog << all
+              << "Pix  " << Form("%4i", pix->GetPixId()) << ":         "
+              << "   Offset: "
+              << Form("%4.2f +- %4,2f", pix->GetTimeOffset(), pix->GetTimeOffsetErr())
+              << "   Precision: "
+              << Form("%4.2f +- %4.2f", pix->GetTimePrecision(), pix->GetTimePrecisionErr())
+              << endl;
           id++;
-        }
-    }
-  
+      }
+  }
+
   *fLog << all << id << " pixels" << endl;
   id = 0;
-  
-   
+
+
   *fLog << all << endl;
   *fLog << all << "Excluded pixels:" << endl;
   *fLog << all << endl;
-  
+
   id = 0;
 
@@ -177 +177 @@
   while ((pix=(MCalibrationRelTimePix*)Next5()))
   {
-    *fLog << all 
-          << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Area   ",pix->GetPixId(),
-                  ":  Offset: ",pix->GetTimeOffset()," +- ",pix->GetTimeOffsetErr(),
-                  "   Precision: ",pix->GetTimePrecision()," +- ",pix->GetTimePrecisionErr())
+      *fLog << all
+          << "Average Area   " << Form("%4i", pix->GetPixId()) << ":"
+          << "Offset: "
+          << Form("%4.2f +- %4,2f", pix->GetTimeOffset(), pix->GetTimeOffsetErr())
+          << "   Precision: "
+          << Form("%4.2f +- %4.2f", pix->GetTimePrecision(), pix->GetTimePrecisionErr())
           << endl;
   }
@@ -187 +189 @@
   while ((pix=(MCalibrationRelTimePix*)Next5()))
   {
-    *fLog << all 
-          << Form("%s%4i%s%4.2f%s%4.2f%s%4.2f%s%4.2f","Average Sector ",pix->GetPixId(),
-                  ":  Offset: ",pix->GetTimeOffset()," +- ",pix->GetTimeOffsetErr(),
-                  "   Precision: ",pix->GetTimePrecision()," +- ",pix->GetTimePrecisionErr())
+      *fLog << all
+          << "Average Sector " << Form("%4i", pix->GetPixId()) << ":"
+          << "Offset: "
+          << Form("%4.2f +- %4.2f", pix->GetTimeOffset(), pix->GetTimeOffsetErr())
+          << "   Precision: "
+          << Form("%4.2f +- %4.2f", pix->GetTimePrecision(), pix->GetTimePrecisionErr())
           << endl;
   }
@@ -232 +236 @@
         return kFALSE;
       val = pix.GetMean();
-      break;
+      return val!=-1.;
     case 1:
       if (pix.IsExcluded())
@@ -257 +261 @@
     }
 
-  return val!=-1.;
-
-}
-
+  return val>=0;
+
+}
+

trunk/MagicSoft/Mars/mcalib/Makefile

@@ -39 +39 @@
            MCalibrationPatternDecode.cc \
            MCalibrateRelTimes.cc \
-           MCalibrationIntensityCam.cc \
-           MCalibrationIntensityChargeCam.cc \
            MCalibrationCam.cc \
            MCalibrationPix.cc  \

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -78 +78 @@
 #include "MLogManip.h"
 
-#include "MCalibrationIntensityCam.h"
 #include "MCalibrationCam.h"
 #include "MCalibrationPix.h"
@@ -144 +143 @@
     fHistXTitle(gsHistXTitle),fHistYTitle(gsHistYTitle),
     fCurrentNumEvts(0), fColor(MCalibrationCam::kNONE),
-    fBadPixels(NULL), fIntensCam(NULL), fCam(NULL), fGeom(NULL),
+    fBadPixels(NULL), fCam(NULL), fGeom(NULL),
     fRunHeader(NULL)
 {
@@ -606 +605 @@
   if (!fBadPixels)
   {
+      /*
       fBadPixels = (MBadPixelsCam*)pList->FindCreateObj(AddSerialNumber("MBadPixelsCam"));
       if (!fBadPixels)
           return kFALSE;
 
-      fBadPixels->InitSize(npixels);
+          fBadPixels->InitSize(npixels);
+          */
+      *fLog << err << "MBadPixelsCam not found... abort." << endl;
+      return kFALSE;
   }
 
@@ -762 +765 @@
           }
         else
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+          InitHists(pix, fCam->GetAverageBadArea(j),j);
       }
   }
@@ -775 +778 @@
 
           pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors), fFirst, fLast);
-          
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+
+          InitHists(pix, fCam->GetAverageBadSector(j),j);
       }
   }
@@ -835 +838 @@
           }
         else
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+          InitHists(pix, fCam->GetAverageBadArea(j),j);
       }
   }
@@ -849 +852 @@
           pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors), fFirst, fLast);
           
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+          InitHists(pix, fCam->GetAverageBadSector(j),j);
       }
   }
@@ -1034 +1037 @@
 // -------------------------------------------------------------
 //
-// - Searches for the CalibrationIntensity*Cam corresponding to 'name'. 
-// - In case, it does not exist in the parameter list, it searches
-//   for the corresponding MCalibration*Cam.
+// - Searches for the Calibration*Cam corresponding to 'name'.
 // - Initializes the MCalibration*Cam, if not yet done.
 // 
@@ -1042 +1043 @@
 {
 
-  TString intensname = "MCalibrationIntensity";
-  intensname += name;
-  intensname += "Cam";
-
-  TString ordname    = "MCalibration";
-  ordname    += name;
-  ordname    += "Cam";
-
-  fIntensCam = (MCalibrationIntensityCam*)plist->FindObject(AddSerialNumber(intensname));
-  if (fIntensCam)
-    *fLog << inf << "Found " << intensname << "... " << endl;
-  else
-    {
-      fCam = (MCalibrationCam*)plist->FindObject(AddSerialNumber(ordname));
+  TString ordname = "MCalibration";
+  ordname += name;
+  ordname += "Cam";
+
+  fCam = (MCalibrationCam*)plist->FindObject(AddSerialNumber(ordname));
+  if (!fCam)
+  {
+      fCam = (MCalibrationCam*)plist->FindCreateObj(AddSerialNumber(ordname));
       if (!fCam)
-        {
-          fCam = (MCalibrationCam*)plist->FindCreateObj(AddSerialNumber(ordname));
-          if (!fCam)
-              return kFALSE;
-
-          fCam->Init(*fGeom);
-        }
-    }
+          return kFALSE;
+
+      fCam->Init(*fGeom);
+  }
+
   return kTRUE;
 }
@@ -1182 +1174 @@
   if (!IsAverageing())
     return;
-  
-  MCalibrationCam *cam = fIntensCam ? fIntensCam->GetCam() : fCam;
+
+  MCalibrationCam *cam = fCam;
   if (!cam)
     return;
-  
+
   for (UInt_t j=0; j<fGeom->GetNumAreas(); j++)
     {
-  
+
       MCalibrationPix &pix    = cam->GetAverageArea(j);
 
@@ -1241 +1233 @@
   if (hist.IsEmpty())
   {
-      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram empty." << endl;
+      //*fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram empty." << endl;
+      //bad.SetUncalibrated( fittyp );
+      return;
+  }
+  if (hist.IsOnlyOverflow())
+  {
+      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only overflows (Check Binning!)." << endl;
       bad.SetUncalibrated( fittyp );
       return;
   }
-  if (hist.IsOnlyOverflow())
-  {
-      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only overflows." << endl;
-      bad.SetUncalibrated( fittyp );
-      return;
-  }
   if (hist.IsOnlyUnderflow())
   {
-      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only underflows." << endl;
+      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only underflows (Check Binning!)." << endl;
       bad.SetUncalibrated( fittyp );
       return;
@@ -1346 +1338 @@
   if (hist.IsEmpty())
   {
-      // *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram empty." << endl;
+      //*fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram empty." << endl;
+      //bad.SetUncalibrated( fittyp ); // FIXME: Combine with HiGain!
+      return;
+  }
+  if (hist.IsOnlyOverflow())
+  {
+      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only overflows (Check Binning!)." << endl;
       bad.SetUncalibrated( fittyp );
       return;
   }
-  if (hist.IsOnlyOverflow())
-  {
-      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only overflows." << endl;
-      bad.SetUncalibrated( fittyp );
-      return;
-  }
   if (hist.IsOnlyUnderflow())
   {
-      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only underflows." << endl;
+      *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only underflows (Check Binning!)." << endl;
       bad.SetUncalibrated( fittyp );
       return;

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h

@@ -29 +29 @@
 class MGeomCam;
 class MRawRunHeader;
-class MCalibrationIntensityCam;
 class MCalibrationCam;
 class MCalibrationPix;
@@ -100 +99 @@
 
   MBadPixelsCam    *fBadPixels;           //! Bad Pixels storage container
-  MCalibrationIntensityCam *fIntensCam;   //! Intensity Calibration Cam with the results
   MCalibrationCam  *fCam;                 //! Calibration Cam with the results
   MGeomCam         *fGeom;                //! Camera geometry

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.57 2007-04-25 14:39:43 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.58 2007-04-27 10:04:47 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -143 +143 @@
 #include "MHCalibrationPix.h"
 
-#include "MCalibrationIntensityCam.h"
 #include "MCalibrationChargeCam.h"
 #include "MCalibrationChargePix.h"
@@ -339 +338 @@
 // Gets or creates the pointers to:
 // - MExtractedSignalCam
-// - MCalibrationChargeCam or MCalibrationIntensityChargeCam
+// - MCalibrationChargeCam
 // - MBadPixelsCam
 //
@@ -472 +471 @@
         pix.SetBinningAbsTime(higainsamples, -0.5, higainsamples-0.5);
 
-        InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+        InitHists(pix, fCam->GetAverageBadArea(j),j);
 
         h =  pix.GetHAbsTime();
@@ -498 +497 @@
           pix.SetBinningAbsTime(higainsamples, -0.5, higainsamples-0.5);
 
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+          InitHists(pix, fCam->GetAverageBadSector(j),j);
 
           h =  pix.GetHAbsTime();
@@ -582 +581 @@
           pix.SetBinningAbsTime(logainsamples, -0.5, logainsamples-0.5);
           
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+          InitHists(pix, fCam->GetAverageBadArea(j),j);
 
           h =  pix.GetHAbsTime();
@@ -609 +608 @@
         pix.SetBinningAbsTime(logainsamples, -0.5, logainsamples-0.5);
         
-        InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+        InitHists(pix, fCam->GetAverageBadSector(j),j);
 
         h =  pix.GetHAbsTime();
@@ -862 +861 @@
   TH1F *h = NULL;
 
-  MCalibrationCam *chargecam = fIntensCam ? fIntensCam->GetCam() : fCam;
-
   const Int_t hifirst = fSignal->GetFirstUsedSliceHiGain();
   const Int_t hilast  = fSignal->GetLastUsedSliceHiGain();
@@ -871 +868 @@
   for (Int_t i=0; i<fHiGainArray->GetSize(); i++)
     {
-      
+
       MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)(*this)[i];
-      
       if (histhi.IsExcluded())
         continue;
 
-      MCalibrationChargePix  &pix = (MCalibrationChargePix&)(*chargecam)[i] ;
+      MCalibrationChargePix  &pix = (MCalibrationChargePix&)(*fCam)[i];
 
       const Int_t numsat = histhi.GetSaturated();
@@ -935 +931 @@
           }
 
-        MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i] ;
+        MCalibrationChargePix &pix = (MCalibrationChargePix&)(*fCam)[i] ;
         if (!pix.IsHiGainSaturation())
             continue;
@@ -966 +962 @@
       
       MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)GetAverageHiGainArea(j);      
-      MCalibrationChargePix  &pix    = (MCalibrationChargePix&)chargecam->GetAverageArea(j);
+      MCalibrationChargePix  &pix    = (MCalibrationChargePix&)fCam->GetAverageArea(j);
 
       if (histhi.GetSaturated() > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries())
@@ -976 +972 @@
         }
 
-      MBadPixelsPix &bad = chargecam->GetAverageBadArea(j);
+      MBadPixelsPix &bad = fCam->GetAverageBadArea(j);
       FinalizeAbsTimes(histhi, pix, bad, hifirst, hilast);
    }
@@ -994 +990 @@
           }
         
-        MCalibrationChargePix  &pix    = (MCalibrationChargePix&)chargecam->GetAverageArea(j);
-
+        MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageArea(j);
         if (pix.IsHiGainSaturation())
           {
-            MBadPixelsPix &bad = chargecam->GetAverageBadArea(j);
+            MBadPixelsPix &bad = fCam->GetAverageBadArea(j);
             FinalizeAbsTimes(histlo, pix, bad, lofirst, lolast);
           }
-        
+
       }
   
@@ -1008 +1003 @@
       
       MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)GetAverageHiGainSector(j);      
-      MCalibrationChargePix  &pix    = (MCalibrationChargePix&)chargecam->GetAverageSector(j);
+      MCalibrationChargePix  &pix    = (MCalibrationChargePix&)fCam->GetAverageSector(j);
 
       if (histhi.GetSaturated() > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries())
@@ -1018 +1013 @@
         }
 
-      MBadPixelsPix &bad = chargecam->GetAverageBadSector(j);
+      MBadPixelsPix &bad = fCam->GetAverageBadSector(j);
       FinalizeAbsTimes(histhi, pix, bad, hifirst, hilast);
     }
@@ -1025 +1020 @@
     for (Int_t j=0; j<fAverageLoGainSectors->GetSize(); j++)
       {
-        
+
         MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)GetAverageLoGainSector(j);      
-        MBadPixelsPix          &bad    = chargecam->GetAverageBadSector(j);
-        
+        MBadPixelsPix          &bad    = fCam->GetAverageBadSector(j);
+
         if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
           {
@@ -1037 +1032 @@
             continue;
           }
-        
-        MCalibrationChargePix  &pix    = (MCalibrationChargePix&)chargecam->GetAverageSector(j);
-
+
+        MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageSector(j);
         if (pix.IsHiGainSaturation())
           FinalizeAbsTimes(histlo, pix, bad, lofirst, lolast);
@@ -1047 +1041 @@
   // Perform the fitting for the High Gain (done in MHCalibrationCam)
   //
-  FitHiGainArrays(*chargecam, *fBadPixels,
+  FitHiGainArrays(*fCam, *fBadPixels,
                   MBadPixelsPix::kHiGainNotFitted,
                   MBadPixelsPix::kHiGainOscillating);
@@ -1055 +1049 @@
   //
   if (IsLoGain())
-    FitLoGainArrays(*chargecam, *fBadPixels,
+    FitLoGainArrays(*fCam, *fBadPixels,
                     MBadPixelsPix::kLoGainNotFitted,
                     MBadPixelsPix::kLoGainOscillating);
@@ -1071 +1065 @@
           continue;
 
-      MCalibrationChargePix  &pix = (MCalibrationChargePix&)(*chargecam)[i] ;
+      MCalibrationChargePix  &pix = (MCalibrationChargePix&)(*fCam)[i];
       if (!pix.IsHiGainSaturation())
           continue;
@@ -1143 +1137 @@
 {
 
-  MCalibrationCam *chargecam = fIntensCam ? fIntensCam->GetCam() : fCam;
-      
   for (Int_t i=0; i<fBadPixels->GetSize(); i++)
     {
-      
-      MBadPixelsPix    &bad    = (*fBadPixels)[i];
-      MCalibrationPix  &pix    = (*chargecam)[i];
+
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      MCalibrationPix &pix = (*fCam)[i];
 
       if (bad.IsUncalibrated(MBadPixelsPix::kHiGainNotFitted))

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

@@ -125 +125 @@
 
 const Float_t MHCalibrationRelTimeCam::fgNumHiGainSaturationLimit = 0.25;
-const UInt_t  MHCalibrationRelTimeCam::fgReferencePixel = 1;
+//const UInt_t  MHCalibrationRelTimeCam::fgReferencePixel = 1;
 const Int_t   MHCalibrationRelTimeCam::fgNbins      = 400;
 const Axis_t  MHCalibrationRelTimeCam::fgFirst      = -9.975;
@@ -141 +141 @@
 //
 // Sets: 
-// - fReferencePixel to fgReferencePixel
 // - fNbins to fgNbins
 // - fFirst to fgFirst
@@ -159 +158 @@
   SetNumHiGainSaturationLimit(fgNumHiGainSaturationLimit);
 
-  SetReferencePixel();
+//  SetReferencePixel();
 
   SetBinning(fgNbins, fgFirst, fgLast);
@@ -263 +262 @@
     return kFALSE;
 
-  MArrivalTimeCam *signal = (MArrivalTimeCam*)pList->FindObject("MArrivalTimeCam");
-  if (!signal)
-  {
-      *fLog << err << "MArrivalTimeCam not found... abort." << endl;
-      return kFALSE;
-  }
-
   const Int_t npixels  = fGeom->GetNumPixels();
   const Int_t nsectors = fGeom->GetNumSectors();
@@ -313 +305 @@
       return kFALSE;
     }
-  
+
   const Int_t npixels  = fGeom->GetNumPixels();
   const Int_t nareas   = fGeom->GetNumAreas();
@@ -327 +319 @@
   fNumsectorlo.Reset();
 
-  const MArrivalTimePix &refpix = (*arrtime)[fReferencePixel];
-  // FIXME: What do we do if pixel is invalid?
-  if (!refpix.IsArrivalTimeValid())
+  TArrayF arr(npixels);
+  Int_t n = 0;
+  for (Int_t i=0; i<npixels; i++)
   {
-      gLog << warn << "WARNING - Arrival time in refrence pixel " << fReferencePixel << " invalid." << endl;
-      return kTRUE;
+      if ((*fGeom)[i].GetAidx()>0)
+          continue;
+
+      const MArrivalTimePix &pix = (*arrtime)[i];
+      if (pix.IsHiGainValid() && !pix.IsHiGainSaturated())
+          arr[n++] = pix.GetArrivalTimeHiGain();
   }
 
-  const Float_t reftime = refpix.GetArrivalTime();
-//      refpix.IsHiGainSaturated()
-//     ? refpix.GetArrivalTimeLoGain() : refpix.GetArrivalTimeHiGain();
+  const Float_t reftime = TMath::Median(n, arr.GetArray());
 
   for (Int_t i=0; i<npixels; i++)
@@ -345 +339 @@
           continue;
 
-      const Int_t aidx   = (*fGeom)[i].GetAidx();
-      const Int_t sector = (*fGeom)[i].GetSector();
-
       const MArrivalTimePix &pix = (*arrtime)[i];
 
@@ -361 +352 @@
               histhi.FillHist(time-reftime);
 
+          const Int_t aidx   = (*fGeom)[i].GetAidx();
+          const Int_t sector = (*fGeom)[i].GetSector();
+
           fSumareahi  [aidx]   += time;
           fNumareahi  [aidx]   ++;
@@ -373 +367 @@
 /*
       // If lo-gain arrival time has been extracted successfully,
-      // the hi-gain has saturateed and the lo-gain is switched on
+      // the hi-gain has saturated and the lo-gain is switched on
       // fill hi-gain histograms and arrays
       if (pix.IsLoGainValid() && IsLoGain())
       {
           const Float_t time = pix.GetArrivalTimeLoGain();
+
+          // FIXME: We need the reference time of the lo-gains!
 
           MHCalibrationPix &histlo = (*this)(i);
@@ -393 +389 @@
 
   for (Int_t j=0; j<nareas; j++)
-    {
-      MHCalibrationPix &histhi = GetAverageHiGainArea(j);
-      if (IsOscillations())
-          histhi.FillHistAndArray(fNumareahi[j] == 0 ? 0. : fSumareahi[j]/fNumareahi[j]);
-      else
-          histhi.FillHist(fNumareahi[j] == 0 ? 0. : fSumareahi[j]/fNumareahi[j]);
-
-      if (IsLoGain())
-        {
+  {
+      if (fNumareahi[j]>0)
+      {
+          MHCalibrationPix &histhi = GetAverageHiGainArea(j);
+          if (IsOscillations())
+              histhi.FillHistAndArray(fSumareahi[j]/fNumareahi[j]);
+          else
+              histhi.FillHist(fSumareahi[j]/fNumareahi[j]);
+      }
+
+      if (IsLoGain() && fNumarealo[j]>0)
+      {
           MHCalibrationPix &histlo = GetAverageLoGainArea(j);
-          if (IsOscillations())
-              histlo.FillHistAndArray(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]);
+          if (IsOscillations())
+              histlo.FillHistAndArray(fSumarealo[j]/fNumarealo[j]);
           else
-              histlo.FillHist(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]);
-        }
-    }
-  
+              histlo.FillHist(fSumarealo[j]/fNumarealo[j]);
+      }
+  }
+
   for (Int_t j=0; j<nsectors; j++)
-    {
-      MHCalibrationPix &histhi = GetAverageHiGainSector(j);
-      if (IsOscillations())
-          histhi.FillHistAndArray(fNumsectorhi[j] == 0 ? 0. : fSumsectorhi[j]/fNumsectorhi[j]);
-      else
-          histhi.FillHist(fNumsectorhi[j] == 0 ? 0. : fSumsectorhi[j]/fNumsectorhi[j]);
-
-      if (IsLoGain())
-        {
+  {
+      if (fNumsectorhi[j]>0)
+      {
+          MHCalibrationPix &histhi = GetAverageHiGainSector(j);
+          if (IsOscillations())
+              histhi.FillHistAndArray(fSumsectorhi[j]/fNumsectorhi[j]);
+          else
+              histhi.FillHist(fSumsectorhi[j]/fNumsectorhi[j]);
+      }
+
+      if (IsLoGain() && fNumsectorlo[j]>0)
+      {
           MHCalibrationPix &histlo = GetAverageLoGainSector(j);
-          if (IsOscillations())
-              histlo.FillHistAndArray(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]);
+          if (IsOscillations())
+              histlo.FillHistAndArray(fSumsectorlo[j]/fNumsectorlo[j]);
           else
-              histlo.FillHist(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]);
-        }
-    }
+              histlo.FillHist(fSumsectorlo[j]/fNumsectorlo[j]);
+      }
+  }
 
   return kTRUE;
@@ -459 +461 @@
       if (histhi.IsExcluded())
         continue;
-      
+
       const Int_t aidx   = (*fGeom)[i].GetAidx();
       const Int_t sector = (*fGeom)[i].GetSector();
@@ -562 +564 @@
 
       if (bad.IsUncalibrated( MBadPixelsPix::kRelTimeNotFitted ))
-        bad.SetUnsuitable(   MBadPixelsPix::kUnreliableRun    );
+          bad.SetUnsuitable(   MBadPixelsPix::kUnreliableRun    );
 
       if (bad.IsUncalibrated( MBadPixelsPix::kRelTimeOscillating))
-        bad.SetUnsuitable(   MBadPixelsPix::kUnreliableRun    );
-      
+          bad.SetUnsuitable(   MBadPixelsPix::kUnreliableRun    );
+
     }
 }
@@ -577 +579 @@
 // ============== 
 //
-// 0: Fitted Mean Relative Arrival Time in FADC slices  (MHGausEvents::GetMean()
-// 1: Error Mean Relative Arrival Time in FADC slices   (MHGausEvents::GetMeanErr()
+// 0: Fitted Mean  Relative Arrival Time in FADC slices (MHGausEvents::GetMean()
+// 1: Error  Mean  Relative Arrival Time in FADC slices (MHGausEvents::GetMeanErr()
 // 2: Sigma fitted Relative Arrival Time in FADC slices (MHGausEvents::GetSigma()
-// 3: Error Sigma Relative Arrival Time in FADC slices  (MHGausEvents::GetSigmaErr()
+// 3: Error Sigma  Relative Arrival Time in FADC slices (MHGausEvents::GetSigmaErr()
 //
 // Useful variables derived from the fit results:
 // =============================================
 //
-// 4: Returned probability of Gauss fit              (calls: MHGausEvents::GetProb())
+// 4: Returned probability of Gauss fit  (MHGausEvents::GetProb())
 //
 // Localized defects:
 // ==================
 //
-// 5: Gaus fit not OK                               (calls: MHGausEvents::IsGausFitOK())
-// 6: Fourier spectrum not OK                       (calls: MHGausEvents::IsFourierSpectrumOK())
+// 5: Gaus fit not OK                    (MHGausEvents::IsGausFitOK())
+// 6: Fourier spectrum not OK            (MHGausEvents::IsFourierSpectrumOK())
 //
 Bool_t MHCalibrationRelTimeCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
@@ -849 +851 @@
     }
 
-    if (IsEnvDefined(env, prefix, "ReferencePixel", print))
-    {
-        SetReferencePixel(GetEnvValue(env, prefix, "ReferencePixel", (Int_t)fReferencePixel));
-        rc = kTRUE;
-    }
-
     TEnv refenv(fReferenceFile);
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h

@@ -22 +22 @@
 
   static const Float_t fgNumHiGainSaturationLimit;   //! The default for fNumHiGainSaturationLimit (now at: 0.25)
-  static const UInt_t  fgReferencePixel;             //! Default for fReferencePixel   (now set to: 1)
   static const Int_t   fgNbins;                      //! Default number of bins        (now set to: 900   )
   static const Axis_t  fgFirst;                      //! Default lower histogram limit (now set to: -13.5 )
@@ -35 +34 @@
   static const TString fgReferenceFile;              //! default for fReferenceFile ("mjobs/calibrationref.rc")
 
-  UInt_t  fReferencePixel;                           // The reference pixel for rel. times
   Float_t fInnerRefTime;                             // The reference mean arrival time inner pixels
   Float_t fOuterRefTime;                             // The reference mean arrival time outer pixels
@@ -66 +64 @@
   ~MHCalibrationRelTimeCam() {}
 
-  UInt_t GetReferencePixel() const { return fReferencePixel; }
-
   // Clone
   TObject *Clone(const char *name="") const;
 
   // Setters
-  void  SetReferencePixel( const UInt_t i=fgReferencePixel   ) { fReferencePixel = i;   }
   void  SetReferenceFile ( const TString ref=fgReferenceFile ) { fReferenceFile  = ref; }
 

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -69 +69 @@
 
 #include "MCalibConstCam.h"
-#include "MCalibrationIntensityChargeCam.h"
 
 #include "MHCalibrationChargeCam.h"
@@ -125 +124 @@
 //
 MJCalibrateSignal::MJCalibrateSignal(const char *name, const char *title)
-    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kFALSE), fIsMovieMode(kFALSE)
+    : fExtractor(0), fIsInterlaced(kTRUE), fIsRelTimesUpdate(kTRUE), fIsMovieMode(kFALSE)
 {
     fName  = name  ? name  : "MJCalibrateSignal";
@@ -250 +249 @@
 
     // Read File
-    MCalibrationIntensityChargeCam      ichcam;
-
     MHCalibrationChargeCam      hchacam;
     MHCalibrationChargeBlindCam hbndcam;
@@ -276 +273 @@
     if (fIsInterlaced)
     {
-        interlacedcont.Add(&ichcam);
         interlacedcont.Add(&hchacam);
         if (IsUseBlindPixel())
@@ -531 +527 @@
 
     MCalibrationChargeCalc  chcalc;
+    chcalc.SetContinousCalibration();
     chcalc.SetExtractor(extractor3);
 
@@ -546 +543 @@
 
     //
-    // Intensity Calibration histogramming
+    // Calibration histogramming
     //
     MFillH filpin(&hpndiod, "MExtractedSignalPINDiode",   "FillPINDiode");
@@ -695 +692 @@
     tlist3.SetFilter(&fcalib);
 
-    //MFDataPhrase filcalco("MCalibrationIntensityConstCam.IsReadyToSave>0.5", "CalibConstFilter");
+    //MFDataPhrase filcalco("MCalibrationConstCam.IsReadyToSave>0.5", "CalibConstFilter");
     if (fIsInterlaced)
     {

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -19 +19 @@
 !   Author(s): Markus Gaug, 02/2004 <mailto:markus@ifae.es>
 !
-!   Copyright: MAGIC Software Development, 2000-2005
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -218 +218 @@
   fRefConvFADC2PheInner      = 0.14;
   fRefConvFADC2PheOuter      = 0.52;
-  fRefQEInner                = 0.18;            
+  fRefQEInner                = 0.18;
   fRefQEOuter                = 0.12;
-  fRefArrivalTimeInner       = 4.5;            
+  fRefArrivalTimeInner       = 4.5;
   fRefArrivalTimeOuter       = 5.0;
-  fRefArrivalTimeRmsInner    = 0.5;            
+  fRefArrivalTimeRmsInner    = 0.5;
   fRefArrivalTimeRmsOuter    = 0.5;
-  fRefTimeOffsetInner        = -0.23;    
-  fRefTimeOffsetOuter        = 0.39;    
-  fRefTimeResolutionInner    = 0.153;
-  fRefTimeResolutionOuter    = 0.128;
+  fRefTimeOffsetOuter        = 0.62;
+  fRefTimeResolutionInner    = 0.12;
+  fRefTimeResolutionOuter    = 0.09;
 
 }
@@ -813 +812 @@
       // for the datacheck, fix the ranges!!
       //
-      const Double_t max = 11.;
+      const Double_t max = 12.;
       obj8->SetMinimum(0.);
       obj8->SetMaximum(max);
@@ -825 +824 @@
       const Int_t numcol = gStyle->GetNumberOfColors()-3;
       
-      TPaveText *pave = new TPaveText(0.05,0.02,0.975,0.99);
+      TPaveText *pave = new TPaveText(0.05,0.02,0.975,0.999);
       pave->SetBit(kCanDelete);
       pave->ConvertNDCtoPad();
@@ -866 +865 @@
       t17->SetTextColor(gStyle->GetColorPalette(Int_t(9./max*numcol)));
       t17->SetTextAlign(12);
+      TText *t18 = pave->AddText(Form("Deviating Rel. Arrival Time RMS:                %3i pixels",
+                                       CountBadPixels(&disp24,10 )));
+      t18->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol)));
+      t18->SetTextAlign(12);
       TText *t15= pave->AddText(Form("Too many Low-Gain Blackout Events:       %3i pixels",
-                                       CountBadPixels(&disp24,10 )));
-      t15->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol)));
+                                       CountBadPixels(&disp24,11 )));
+      t15->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol)));
       t15->SetTextAlign(12);
       TText *t14= pave->AddText(Form("Previously Excluded:                                   %3i pixels",
-                                       CountBadPixels(&disp24,11)));
-      t14->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol)));
+                                       CountBadPixels(&disp24,12)));
+      t14->SetTextColor(gStyle->GetColorPalette(Int_t(12./max*numcol)));
       t14->SetTextAlign(12);
       pave->Draw();
@@ -903 +906 @@
       gStyle->SetPalette(1);
       
-      TPaveText *pave2 = new TPaveText(0.025,0.02,0.95,0.99);
+      TPaveText *pave2 = new TPaveText(0.025,0.02,0.95,0.999);
       pave2->SetBit(kCanDelete);
       pave2->ConvertNDCtoPad();
@@ -1239 +1242 @@
       break;
     case 5:
-      l1 = line.DrawLine(0, fRefTimeOffsetInner, x, fRefTimeOffsetInner );
+      l1 = line.DrawLine(0, 0, x, 0);
       break;
     case 6:
@@ -1391 +1394 @@
 //   RefArrivalTimeRmsOuter
 //
-//   RefTimeOffsetInner
 //   RefTimeOffsetOuter
 //   RefTimeResolutionInner
@@ -1425 +1427 @@
     fRefArrivalTimeRmsInner = refenv.GetValue("RefArrivalTimeRmsInner",fRefArrivalTimeRmsInner);
     fRefArrivalTimeRmsOuter = refenv.GetValue("RefArrivalTimeRmsOuter",fRefArrivalTimeRmsOuter);
-    fRefTimeOffsetInner     = refenv.GetValue("RefTimeOffsetInner",fRefTimeOffsetInner);
     fRefTimeOffsetOuter     = refenv.GetValue("RefTimeOffsetOuter",fRefTimeOffsetOuter);
     fRefTimeResolutionInner = refenv.GetValue("RefTimeResolutionInner",fRefTimeResolutionInner);
@@ -1894 +1895 @@
     tlist.AddToList(&cont);
 
-    if (IsRelTimes())
-    {
-        tlist.AddToList(&filltme);
-        tlist.AddToList(&timecalc);
-    }
-
     tlist.AddToList(&fillcam);
 
@@ -1909 +1904 @@
     tlist.AddToList(&calcalc);
 
+    if (IsRelTimes())
+    {
+        tlist.AddToList(&filltme);
+        tlist.AddToList(&timecalc);
+    }
 
     MHCamEvent evt2(0, "Extra'd", "Extracted Calibration Signal;;S [cnts/sl]");

trunk/MagicSoft/Mars/mjobs/calibrationref.rc

@@ -63 +63 @@
 # Relative Time Calibration:
 #
-RefTimeOffsetInner:       -0.23
-RefTimeOffsetOuter:       0.39    
-RefTimeResolutionInner:   0.153
-RefTimeResolutionOuter:   0.128
+RefTimeOffsetOuter:       0.62    
+RefTimeResolutionInner:   0.12
+RefTimeResolutionOuter:   0.09
 #
 # Mean Absolute Time:

trunk/MagicSoft/Mars/mjobs/calibrationref_Dec04.rc

@@ -63 +63 @@
 # Relative Time Calibration:
 #
-RefTimeOffsetInner:       -0.23
-RefTimeOffsetOuter:       0.39    
-RefTimeResolutionInner:   0.153
-RefTimeResolutionOuter:   0.128
+RefTimeOffsetOuter:       0.62
+RefTimeResolutionInner:   0.12
+RefTimeResolutionOuter:   0.09
 #
 # Mean Absolute Time:

trunk/MagicSoft/Mars/mjobs/calibrationref_Nov04.rc

@@ -63 +63 @@
 # Relative Time Calibration:
 #
-RefTimeOffsetInner:       -0.23
-RefTimeOffsetOuter:       0.39    
-RefTimeResolutionInner:   0.153
-RefTimeResolutionOuter:   0.128
+RefTimeOffsetOuter:       0.62
+RefTimeResolutionInner:   0.12
+RefTimeResolutionOuter:   0.09
 #
 # Mean Absolute Time:

trunk/MagicSoft/Mars/resources/calibrationref_mux.rc

@@ -30 +30 @@
 #
 TimeOffsetMin:           -9.
-TimeOffsetMax:            9.
+TimeOffsetMax:           12.
 
-TimeResolutionMin:        1.
-TimeResolutionMax:        1.5
+TimeResolutionMin:        0.45
+TimeResolutionMax:        1.25
 
 ######################################################################
@@ -68 +68 @@
 # Relative Time Calibration:
 #
-RefTimeOffsetInner:       -3.5
-RefTimeOffsetOuter:        2
-RefTimeResolutionInner:    1.25
-RefTimeResolutionOuter:    1.1
+RefTimeOffsetOuter:        5.5
+RefTimeResolutionInner:    0.9
+RefTimeResolutionOuter:    0.7
 
 #