Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 8507) +++ trunk/MagicSoft/Mars/Changelog (revision 8508) @@ -50,4 +50,13 @@ * mjobs/MJPedestal.cc: - removed obsolete include of MCalibrationPedCam + + * mcalib/MCalibrationPulseTimeCam.[h,cc]: + - removed some obsolete Add functions already contained in + the base class + + * mcalib/MCalibrationIntensityBlindCam.[h,cc], + mcalib/MCalibrationIntensityQECam.[h,cc], + mcalib/MCalibrationIntensityTestCam.[h,cc]: + - removed Index: trunk/MagicSoft/Mars/NEWS =================================================================== --- trunk/MagicSoft/Mars/NEWS (revision 8507) +++ trunk/MagicSoft/Mars/NEWS (revision 8508) @@ -23,4 +23,7 @@ simplified the process of producing several movies from a single sequence with different setup. + + - callisto: Some more code cleanup. Started to remove old obsolete + code from cvs. - callisto: The extraction of the pedestal with the extractor was @@ -40,5 +43,7 @@ positive offset of the randomly extracted pedestal for a few pixels. I doubt that this has a big effect on the result, because the effect - on the individual numbers is quite small. + on the individual numbers is quite small. Due to this it is suggested + that you rerun your calibration to make sure you are without any + avoidable bias. - callisto: the ArrTimeRmsLimit is now is a check of the deviation from Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityQECam.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityQECam.cc (revision 8507) +++ (revision ) @@ -1,91 +1,0 @@ -/* ======================================================================== *\ -! -! * -! * This file is part of MARS, the MAGIC Analysis and Reconstruction -! * Software. It is distributed to you in the hope that it can be a useful -! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. -! * It is distributed WITHOUT ANY WARRANTY. -! * -! * Permission to use, copy, modify and distribute this software and its -! * documentation for any purpose is hereby granted without fee, -! * provided that the above copyright notice appear in all copies and -! * that both that copyright notice and this permission notice appear -! * in supporting documentation. It is provided "as is" without express -! * or implied warranty. -! * -! -! -! Author(s): Markus Gaug 11/2003 -! -! Copyright: MAGIC Software Development, 2000-2004 -! -! -\* ======================================================================== */ -///////////////////////////////////////////////////////////////////////////// -// -// MCalibrationIntensityQECam -// -// Storage container for intensity charge calibration results. -// -// Individual MCalibrationQECam's can be retrieved with: -// - GetCam() yielding the current cam. -// - GetCam("name") yielding the current camera with name "name". -// - GetCam(i) yielding the i-th camera. -// -// See also: MCalibrationIntensityCam, MCalibrationQECam, -// MCalibrationQEPix, MCalibrationChargeCalc -// MHCalibrationChargePix, MHCalibrationChargeCam -// -///////////////////////////////////////////////////////////////////////////// -#include "MCalibrationIntensityQECam.h" -#include "MCalibrationQECam.h" - -#include - -ClassImp(MCalibrationIntensityQECam); - -using namespace std; -// -------------------------------------------------------------------------- -// -// Default constructor. -// -MCalibrationIntensityQECam::MCalibrationIntensityQECam(const char *name, const char *title) -{ - - fName = name ? name : "MCalibrationIntensityQECam"; - fTitle = title ? title : "Results of the Intensity Calibration"; - - InitSize(1); -} - -// ------------------------------------------------------------------- -// -// Add MCalibrationQECams in the ranges from - to. -// -void MCalibrationIntensityQECam::Add(const UInt_t from, const UInt_t to) -{ - for (UInt_t i=from; iAddAt(new MCalibrationQECam,i); -} - -// -------------------------------------------------------------------------- -// -// Calls TObjArray::Expand() for fCams and initialze one MCalibrationQECam -// and copy the entries -// -void MCalibrationIntensityQECam::InitSize(const UInt_t n) -{ - - MCalibrationQECam *oldcam = NULL; - - if (n>1) - oldcam = (MCalibrationQECam*)GetCam(); - - MCalibrationIntensityCam::InitSize(n); - - MCalibrationQECam *newcam = (MCalibrationQECam*)GetCam(); - - if (oldcam) - oldcam->Copy(*newcam); -} - Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityQECam.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityQECam.h (revision 8507) +++ (revision ) @@ -1,72 +1,0 @@ -#ifndef MARS_MCalibrationIntensityQECam -#define MARS_MCalibrationIntensityQECam - -#ifndef MARS_MCalibrationIntensityCam -#include "MCalibrationIntensityCam.h" -#endif - -#ifndef MARS_MCalibrationQECam -#include "MCalibrationQECam.h" -#endif - -class MCalibrationIntensityQECam : public MCalibrationIntensityCam -{ -private: - - void Add(const UInt_t from, const UInt_t to); - -public: - - MCalibrationIntensityQECam(const char *name=NULL, const char *title=NULL); - - void InitSize( const UInt_t n ); - - const MArrayD &GetCorningBlues () const { - return ((MCalibrationQECam*)GetCam())->GetCorningBlues(); } - const MArrayD &GetCorningReds () const { - return ((MCalibrationQECam*)GetCam())->GetCorningReds(); } - - Float_t GetPlexiglassQE () const { - return ((MCalibrationQECam*)GetCam())->GetPlexiglassQE(); } - Float_t GetPlexiglassQERelVar () const { - return ((MCalibrationQECam*)GetCam())->GetPlexiglassQERelVar(); } - - Bool_t IsBlindPixelMethodValid () const { - return ((MCalibrationQECam*)GetCam())->IsBlindPixelMethodValid(); } - Bool_t IsFFactorMethodValid () const { - return ((MCalibrationQECam*)GetCam())->IsFFactorMethodValid(); } - Bool_t IsCombinedMethodValid () const { - return ((MCalibrationQECam*)GetCam())->IsCombinedMethodValid(); } - Bool_t IsPINDiodeMethodValid () const { - return ((MCalibrationQECam*)GetCam())->IsPINDiodeMethodValid(); } - - Bool_t IsBlindPixelMethodValid ( MCalibrationCam::PulserColor_t col ) const { - return ((MCalibrationQECam*)GetCam())->IsBlindPixelMethodValid(col); } - Bool_t IsFFactorMethodValid ( MCalibrationCam::PulserColor_t col ) const { - return ((MCalibrationQECam*)GetCam())->IsFFactorMethodValid(col); } - Bool_t IsCombinedMethodValid ( MCalibrationCam::PulserColor_t col ) const { - return ((MCalibrationQECam*)GetCam())->IsCombinedMethodValid(col); } - Bool_t IsPINDiodeMethodValid ( MCalibrationCam::PulserColor_t col ) const { - return ((MCalibrationQECam*)GetCam())->IsPINDiodeMethodValid(col); } - - void SetBlindPixelMethodValid ( const Bool_t b=kTRUE ) { - ((MCalibrationQECam*)GetCam())->SetBlindPixelMethodValid(b); } - void SetBlindPixelMethodValid ( const Bool_t b, MCalibrationCam::PulserColor_t col) { - ((MCalibrationQECam*)GetCam())->SetBlindPixelMethodValid(b,col); } - void SetCombinedMethodValid ( const Bool_t b=kTRUE ) { - ((MCalibrationQECam*)GetCam())->SetCombinedMethodValid(b); } - void SetCombinedMethodValid ( const Bool_t b, MCalibrationCam::PulserColor_t col) { - ((MCalibrationQECam*)GetCam())->SetCombinedMethodValid(b,col); } - void SetFFactorMethodValid ( const Bool_t b=kTRUE ) { - ((MCalibrationQECam*)GetCam())->SetFFactorMethodValid(b); } - void SetFFactorMethodValid ( const Bool_t b, MCalibrationCam::PulserColor_t col) { - ((MCalibrationQECam*)GetCam())->SetFFactorMethodValid(b,col); } - void SetPINDiodeMethodValid ( const Bool_t b=kTRUE ) { - ((MCalibrationQECam*)GetCam())->SetPINDiodeMethodValid(b); } - void SetPINDiodeMethodValid ( const Bool_t b, MCalibrationCam::PulserColor_t col) { - ((MCalibrationQECam*)GetCam())->SetPINDiodeMethodValid(b,col); } - - ClassDef(MCalibrationIntensityQECam, 1) // Container Intensity Rel.Times Calibration Results Camera -}; - -#endif Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityTestCam.cc =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityTestCam.cc (revision 8507) +++ (revision ) @@ -1,71 +1,0 @@ -/* ======================================================================== *\ -! -! * -! * This file is part of MARS, the MAGIC Analysis and Reconstruction -! * Software. It is distributed to you in the hope that it can be a useful -! * and timesaving tool in analysing Data of imaging Cerenkov telescopes. -! * It is distributed WITHOUT ANY WARRANTY. -! * -! * Permission to use, copy, modify and distribute this software and its -! * documentation for any purpose is hereby granted without fee, -! * provided that the above copyright notice appear in all copies and -! * that both that copyright notice and this permission notice appear -! * in supporting documentation. It is provided "as is" without express -! * or implied warranty. -! * -! -! -! Author(s): Markus Gaug 11/2003 -! -! Copyright: MAGIC Software Development, 2000-2004 -! -! -\* ======================================================================== */ -///////////////////////////////////////////////////////////////////////////// -// -// MCalibrationIntensityTestCam -// -// Storage container for intensity charge calibration results. -// -// Individual MCalibrationTestCam's can be retrieved with: -// - GetCam() yielding the current cam. -// - GetCam("name") yielding the current camera with name "name". -// - GetCam(i) yielding the i-th camera. -// -// See also: MCalibrationIntensityCam, MCalibrationTestCam, -// MCalibrationTestPix, MCalibrationTestCalc, MCalibrationQECam -// MHCalibrationTestCam -// -///////////////////////////////////////////////////////////////////////////// -#include "MCalibrationIntensityTestCam.h" -#include "MCalibrationTestCam.h" - -#include - -ClassImp(MCalibrationIntensityTestCam); - -using namespace std; - -// -------------------------------------------------------------------------- -// -// Default constructor. -// -MCalibrationIntensityTestCam::MCalibrationIntensityTestCam(const char *name, const char *title) -{ - - fName = name ? name : "MCalibrationIntensityTestCam"; - fTitle = title ? title : "Results of the Intensity Calibration"; - - InitSize(1); -} - -// ------------------------------------------------------------------- -// -// Add MCalibrationTestCam's in the ranges from - to. -// -void MCalibrationIntensityTestCam::Add(const UInt_t from, const UInt_t to) -{ - for (UInt_t i=from; iAddAt(new MCalibrationTestCam,i); -} - Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityTestCam.h =================================================================== --- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityTestCam.h (revision 8507) +++ (revision ) @@ -1,21 +1,0 @@ -#ifndef MARS_MCalibrationIntensityTestCam -#define MARS_MCalibrationIntensityTestCam - -#ifndef MARS_MCalibrationIntensityCam -#include "MCalibrationIntensityCam.h" -#endif - -class MCalibrationIntensityTestCam : public MCalibrationIntensityCam -{ -private: - - void Add(const UInt_t from, const UInt_t to); - -public: - - MCalibrationIntensityTestCam(const char *name=NULL, const char *title=NULL); - - ClassDef(MCalibrationIntensityTestCam, 1) // Container Intensity Rel.Times Calibration Results Camera -}; - -#endif