Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc =================================================================== --- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc (revision 8338) +++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc (revision 8339) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.37 2006-10-19 13:57:40 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.38 2007-03-01 17:42:27 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -214,12 +214,18 @@ *fLog << (fPedPhot1 && fPedPhot2 ? "on" : "off"); *fLog << "." << endl; - } + + if (fPedPhot1 && fPedPhot2) + *fLog << "Maximum arrival time difference: " << fMaxArrivalTimeDiff << endl; + + } + + *fLog << inf << "Minimum number of neighbor pixels: " << (int)fNumMinNeighbors << endl; if (IsProcessPedestalEvt()) - *fLog << inf << "Processing Pedestals once per event..." << endl; + *fLog << "Processing Pedestals once per event..." << endl; if (IsProcessPedestalRun()) - *fLog << inf << "Processing Pedestals once per run..." << endl; + *fLog << "Processing Pedestals once per run..." << endl; if (IsProcessTimes()) - *fLog << inf << "Processing Arrival Times once per event..." << endl; + *fLog << "Processing Arrival Times once per event..." << endl; return kTRUE; Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (revision 8339) @@ -736,7 +736,5 @@ MHCalibrationPix &pix = (*this)[i]; - pix.SetNbins(fNbins); - pix.SetFirst(fFirst); - pix.SetLast (fLast); + pix.SetBinning(fNbins, fFirst, fLast); pix.SetProbLimit(fProbLimit); @@ -760,8 +758,6 @@ MHCalibrationPix &pix = GetAverageHiGainArea(j); - - pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); - pix.SetFirst(fFirst); - pix.SetLast (fLast); + + pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas), fFirst, fLast); if (fGeom && fGeom->InheritsFrom("MGeomCamMagic")) @@ -783,7 +779,5 @@ MHCalibrationPix &pix = GetAverageHiGainSector(j); - pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors)); - pix.SetFirst(fFirst); - pix.SetLast (fLast); + pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors), fFirst, fLast); InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); @@ -819,7 +813,5 @@ MHCalibrationPix &pix = (*this)(i); - pix.SetNbins(fNbins); - pix.SetFirst(fFirst); - pix.SetLast (fLast); + pix.SetBinning(fNbins, fFirst, fLast); pix.SetProbLimit(fProbLimit); @@ -841,7 +833,5 @@ MHCalibrationPix &pix = GetAverageLoGainArea(j); - pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); - pix.SetFirst(fFirst); - pix.SetLast (fLast); + pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas), fFirst, fLast); if (fGeom && fGeom->InheritsFrom("MGeomCamMagic")) @@ -863,7 +853,5 @@ MHCalibrationPix &pix = GetAverageLoGainSector(j); - pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors)); - pix.SetFirst(fFirst); - pix.SetLast (fLast); + pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nsectors), fFirst, fLast); InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); @@ -1574,10 +1562,10 @@ if (IsEnvDefined(env, prefix, "Nbins", print)) { - SetNbins(GetEnvValue(env, prefix, "Nbins", fNbins)); + fNbins = GetEnvValue(env, prefix, "Nbins", fNbins); rc = kTRUE; } if (IsEnvDefined(env, prefix, "First", print)) { - SetFirst(GetEnvValue(env, prefix, "First", fFirst)); + fFirst = GetEnvValue(env, prefix, "First", fFirst); rc = kTRUE; } @@ -1585,5 +1573,5 @@ if (IsEnvDefined(env, prefix, "Last", print)) { - SetLast(GetEnvValue(env, prefix, "Last", fLast)); + fLast = GetEnvValue(env, prefix, "Last", fLast); rc = kTRUE; } Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h (revision 8339) @@ -237,7 +237,6 @@ void SetUpperFitLimitLoGain( const Double_t d=fgUpperFitLimitLoGain) { fUpperFitLimitLoGain = d; } - void SetNbins ( const Int_t i ) { fNbins = i; } - void SetFirst ( const Axis_t f ) { fFirst = f; } - void SetLast ( const Axis_t f ) { fLast = f; } + void SetBinning(Int_t n, Axis_t lo, Axis_t up) { fNbins=n; fFirst=lo; fLast=up; } + void SetMaxNumEvts ( const Int_t i=fgMaxNumEvts ) { fMaxNumEvts = i; } Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc (revision 8339) @@ -95,7 +95,5 @@ SetSPheCut(); - SetNbins(fgNbins); - SetFirst(fgFirst); - SetLast (fgLast ); + SetBinning(fgNbins, fgFirst, fgLast); SetHistName (gsHistName .Data()); @@ -180,7 +178,7 @@ MHCalibrationChargeBlindPix &pix = (MHCalibrationChargeBlindPix&)(*this)[i]; - pix.SetNbins ( fNbins ); - pix.SetFirst ( fFirst ); - pix.SetLast ( integ ? ((fLast+0.5)*samples)-0.5 : fLast ); + const Axis_t last = integ ? ((fLast+0.5)*samples)-0.5 : fLast; + + pix.SetBinning(fNbins, fFirst, last); pix.SetSinglePheCut ( integ ? fSPheCut * samples : fSPheCut ); pix.SetFitFunc ( integ ? MHCalibrationChargeBlindPix::kEPoisson5 : fFitFunc ); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc (revision 8339) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.51 2007-02-04 17:37:13 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.52 2007-03-01 17:59:12 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -239,13 +239,8 @@ SetTimeUpperLimit(); - SetNbins(fgChargeHiGainNbins); - SetFirst(fgChargeHiGainFirst); - SetLast (fgChargeHiGainLast ); + SetBinning(fgChargeHiGainNbins, fgChargeHiGainFirst, fgChargeHiGainLast ); + SetBinningLoGain(fgChargeLoGainNbins, fgChargeLoGainFirst, fgChargeLoGainLast ); SetProbLimit(fgProbLimit); - - SetLoGainNbins(fgChargeLoGainNbins); - SetLoGainFirst(fgChargeLoGainFirst); - SetLoGainLast (fgChargeLoGainLast ); SetHistName (gsHistName .Data()); @@ -451,13 +446,8 @@ MHCalibrationChargePix &pix = (MHCalibrationChargePix&)(*this)[i]; - pix.SetNbins(fNbins); - pix.SetFirst(fFirst); - pix.SetLast (fLast); - + pix.SetBinning(fNbins, fFirst, fLast); pix.SetProbLimit(fProbLimit); - pix.SetAbsTimeNbins(higainsamples); - pix.SetAbsTimeFirst(-0.5); - pix.SetAbsTimeLast(higainsamples-0.5); + pix.SetBinningAbsTime(higainsamples, -0.5, higainsamples-0.5); InitHists(pix,(*badcam)[i],i); @@ -482,11 +472,8 @@ MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageHiGainArea(j); - pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); - pix.SetFirst(fFirst); - pix.SetLast (fLast); - - pix.SetAbsTimeNbins(higainsamples); - pix.SetAbsTimeFirst(-0.5); - pix.SetAbsTimeLast(higainsamples-0.5); + pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas), + fFirst, fLast); + + pix.SetBinningAbsTime(higainsamples, -0.5, higainsamples-0.5); InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); @@ -511,11 +498,8 @@ MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageHiGainSector(j); - pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); - pix.SetFirst(fFirst); - pix.SetLast (fLast); - - pix.SetAbsTimeNbins(higainsamples); - pix.SetAbsTimeFirst(-0.5); - pix.SetAbsTimeLast(higainsamples-0.5); + pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas), + fFirst, fLast); + + pix.SetBinningAbsTime(higainsamples, -0.5, higainsamples-0.5); InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); @@ -574,13 +558,9 @@ MHCalibrationChargePix &pix = (MHCalibrationChargePix&)(*this)(i); - pix.SetNbins(fLoGainNbins); - pix.SetFirst(fLoGainFirst); - pix.SetLast (fLoGainLast); + pix.SetBinning(fLoGainNbins, fLoGainFirst, fLoGainLast); pix.SetProbLimit(fProbLimit); - pix.SetAbsTimeNbins(logainsamples); - pix.SetAbsTimeFirst(-0.5); - pix.SetAbsTimeLast(logainsamples-0.5); + pix.SetBinningAbsTime(logainsamples, -0.5, logainsamples-0.5); pix.SetPickupLimit(fgLoGainPickupLimit); pix.SetBlackoutLimit(fgLoGainBlackoutLimit); @@ -606,11 +586,8 @@ MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageLoGainArea(j); - pix.SetNbins(fLoGainNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); - pix.SetFirst(fLoGainFirst); - pix.SetLast (fLoGainLast); + pix.SetBinning(fLoGainNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas), + fLoGainFirst, fLoGainLast); - pix.SetAbsTimeNbins(logainsamples); - pix.SetAbsTimeFirst(-0.5); - pix.SetAbsTimeLast(logainsamples-0.5); + pix.SetBinningAbsTime(logainsamples, -0.5, logainsamples-0.5); InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); @@ -636,11 +613,8 @@ MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageLoGainSector(j); - pix.SetNbins(fLoGainNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); - pix.SetFirst(fLoGainFirst); - pix.SetLast (fLoGainLast); - - pix.SetAbsTimeNbins(logainsamples); - pix.SetAbsTimeFirst(-0.5); - pix.SetAbsTimeLast(logainsamples-0.5); + pix.SetBinning(fLoGainNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas), + fLoGainFirst, fLoGainLast); + + pix.SetBinningAbsTime(logainsamples, -0.5, logainsamples-0.5); InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); @@ -905,5 +879,4 @@ const Int_t lolast = fSignal->GetLastUsedSliceLoGain(); - for (Int_t i=0; iGetSize(); i++) { @@ -1154,5 +1127,5 @@ { *fLog << warn << hist.GetName() << ": Mean Arr.Time: " - << Form("%4.1f < %4.1f, (%3.1f + %3.1f)", mean, lowerlimit, fTimeLowerLimit, first) << endl; + << Form("%4.1f < %4.1f (first used fadc sl+1)", mean, lowerlimit) << endl; bad.SetUncalibrated(MBadPixelsPix::kMeanTimeInFirstBin); } @@ -1161,5 +1134,5 @@ { *fLog << warn << hist.GetName() << ": Mean Arr.Time: " - << Form("%4.1f > %4.1f, (%3.1f - %3.1f)", mean, upperlimit, fTimeUpperLimit, last) << endl; + << Form("%4.1f > %4.1f (last used fadc sl-1)", mean, upperlimit) << endl; bad.SetUncalibrated(MBadPixelsPix::kMeanTimeInLast2Bins); } @@ -1432,5 +1405,5 @@ if (IsEnvDefined(env, prefix, "HiGainNbins", print)) { - SetNbins(GetEnvValue(env, prefix, "HiGainNbins", fNbins)); + fNbins = GetEnvValue(env, prefix, "HiGainNbins", fNbins); rc = kTRUE; } @@ -1438,5 +1411,5 @@ if (IsEnvDefined(env, prefix, "HiGainFirst", print)) { - SetFirst(GetEnvValue(env, prefix, "HiGainFirst", fFirst)); + fFirst = GetEnvValue(env, prefix, "HiGainFirst", fFirst); rc = kTRUE; } @@ -1444,5 +1417,5 @@ if (IsEnvDefined(env, prefix, "HiGainLast", print)) { - SetLast(GetEnvValue(env, prefix, "HiGainLast", fLast)); + fLast = GetEnvValue(env, prefix, "HiGainLast", fLast); rc = kTRUE; } @@ -1450,5 +1423,5 @@ if (IsEnvDefined(env, prefix, "LoGainNbins", print)) { - SetLoGainNbins(GetEnvValue(env, prefix, "LoGainNbins", fLoGainNbins)); + fLoGainNbins = GetEnvValue(env, prefix, "LoGainNbins", fLoGainNbins); rc = kTRUE; } @@ -1456,5 +1429,5 @@ if (IsEnvDefined(env, prefix, "LoGainFirst", print)) { - SetLoGainFirst(GetEnvValue(env, prefix, "LoGainFirst", fLoGainFirst)); + fLoGainFirst = GetEnvValue(env, prefix, "LoGainFirst", fLoGainFirst); rc = kTRUE; } @@ -1462,5 +1435,5 @@ if (IsEnvDefined(env, prefix, "LoGainLast", print)) { - SetLoGainLast(GetEnvValue(env, prefix, "LoGainLast", fLoGainLast)); + fLoGainLast = GetEnvValue(env, prefix, "LoGainLast", fLoGainLast); rc = kTRUE; } Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.h (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.h (revision 8339) @@ -122,8 +122,6 @@ void SetAbsHistXTitle ( const char *name ) { fAbsHistXTitle = name; } void SetAbsHistYTitle ( const char *name ) { fAbsHistYTitle = name; } - - void SetLoGainNbins ( const Int_t i ) { fLoGainNbins = i; } - void SetLoGainFirst ( const Axis_t f ) { fLoGainFirst = f; } - void SetLoGainLast ( const Axis_t f ) { fLoGainLast = f; } + + void SetBinningLoGain(Int_t n, Axis_t lo, Axis_t up) { fLoGainNbins=n; fLoGainFirst=lo; fLoGainLast=up; } void SetNumLoGainBlackoutLimit( const Float_t f=fgNumLoGainBlackoutLimit ) { fNumLoGainBlackoutLimit = f; } Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.h (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.h (revision 8339) @@ -98,10 +98,6 @@ // Setters - void SetAbsTimeNbins ( const Int_t bins =fgAbsTimeNbins ) { fAbsTimeNbins = bins; } - void SetAbsTimeFirst ( const Axis_t first=fgAbsTimeFirst ) { fAbsTimeFirst = first; } - void SetAbsTimeLast ( const Axis_t last =fgAbsTimeLast ) { fAbsTimeLast = last; } - void SetRmsChargeNbins ( const Int_t bins =fgRmsChargeNbins ) { fRmsChargeNbins = bins; } - void SetRmsChargeFirst ( const Axis_t first=fgRmsChargeFirst ) { fRmsChargeFirst = first; } - void SetRmsChargeLast ( const Axis_t last =fgRmsChargeLast ) { fRmsChargeLast = last; } + void SetBinningRmsCharge(Int_t n, Axis_t lo, Axis_t up) { fRmsChargeNbins=n; fRmsChargeFirst=lo; fRmsChargeLast=up; } + void SetTimeLowerLimit ( const Float_t f=fgTimeLowerLimit ) { fTimeLowerLimit = f; } void SetTimeUpperLimit ( const Float_t f=fgTimeUpperLimit ) { fTimeUpperLimit = f; } Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.h (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.h (revision 8339) @@ -25,16 +25,14 @@ void InitBins(); - // Setters - virtual void SetAbsTimeNbins(const Int_t bins ) { fAbsTimeNbins = bins; } - virtual void SetAbsTimeFirst(const Axis_t first) { fAbsTimeFirst = first; } - virtual void SetAbsTimeLast( const Axis_t last ) { fAbsTimeLast = last; } + // Setters + void SetBinningAbsTime(Int_t n, Axis_t lo, Axis_t up) { fAbsTimeNbins=n; fAbsTimeFirst=lo; fAbsTimeLast=up; } // Getters - TH1F *GetHAbsTime() { return &fHAbsTime; } - const TH1F *GetHAbsTime() const { return &fHAbsTime; } + TH1F *GetHAbsTime() { return &fHAbsTime; } + const TH1F *GetHAbsTime() const { return &fHAbsTime; } - const Float_t GetAbsTimeMean( ) const; - const Float_t GetAbsTimeRms() const; - const Float_t GetIntegral() const; + const Float_t GetAbsTimeMean() const; + const Float_t GetAbsTimeRms() const; + const Float_t GetIntegral() const; // Fill histos Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc (revision 8339) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.25 2006-11-01 15:48:31 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.26 2007-03-01 17:59:12 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -187,7 +187,5 @@ fTitle = title ? title : "Class to fill the extracted pulse times for cosmics "; - SetNbins(fgHiGainNbins); - SetFirst(fgHiGainFirst); - SetLast (fgHiGainLast ); + SetBinning(fgHiGainNbins, fgHiGainFirst, fgHiGainLast); SetProbLimit(fgProbLimit); @@ -318,7 +316,5 @@ MHCalibrationPix &pix = (*this)[i]; - pix.SetNbins(fNbins*2); - pix.SetFirst(fFirst); - pix.SetLast (fLast); + pix.SetBinning(fNbins, fFirst, fLast); MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i]; @@ -341,8 +337,5 @@ MHCalibrationPix &pix = GetAverageHiGainArea(j); - - pix.SetNbins(fNbins*2); - pix.SetFirst(fFirst); - pix.SetLast (fLast); + pix.SetBinning(fNbins, fFirst, fLast); InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); @@ -357,8 +350,5 @@ Form("%s High Gain Sector %02d",fHistTitle.Data(),j)),j); MHCalibrationPix &pix = GetAverageHiGainSector(j); - - pix.SetNbins(fNbins); - pix.SetFirst(fFirst); - pix.SetLast (fLast); + pix.SetBinning(fNbins, fFirst, fLast); InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 8339) @@ -163,7 +163,5 @@ SetReferencePixel(); - SetNbins(fgNbins); - SetFirst(fgFirst); - SetLast (fgLast ); + SetBinning(fgNbins, fgFirst, fgLast); SetProbLimit(fgProbLimit); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc (revision 8339) @@ -137,7 +137,5 @@ fTitle = title ? title : "Histogram class for testing the calibration"; - SetNbins(fgNbins); - SetFirst(fgFirst); - SetLast (fgLast ); + SetBinning(fgNbins, fgFirst, fgLast); SetProbLimit(fgProbLimit); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc (revision 8339) @@ -138,7 +138,5 @@ fTitle = title ? title : "Histogram class for testing the calibration of arrival times"; - SetNbins(fgNbins); - SetFirst(fgFirst); - SetLast (fgLast ); + SetBinning(fgNbins, fgFirst, fgLast); SetProbLimit(fgProbLimit); Index: trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h (revision 8339) @@ -158,9 +158,6 @@ void SetFourierSpectrumOK( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kFourierSpectrumOK) : CLRBIT(fFlags,kFourierSpectrumOK); } void SetGausFitOK ( const Bool_t b=kTRUE ) { b ? SETBIT(fFlags,kGausFitOK) : CLRBIT(fFlags,kGausFitOK);} - void SetLast ( const Double_t d ) { fLast = d; } - void SetFirst ( const Double_t d ) { fFirst = d; } void SetMean ( const Double_t d ) { fMean = d; } void SetMeanErr ( const Double_t d ) { fMeanErr = d; } - void SetNbins ( const Int_t i ) { fNbins = i; } void SetNDFLimit ( const Int_t lim=fgNDFLimit ) { fNDFLimit = lim; } void SetProb ( const Double_t d ) { fProb = d; } @@ -168,4 +165,6 @@ void SetSigma ( const Double_t d ) { fSigma = d; } void SetSigmaErr ( const Double_t d ) { fSigmaErr = d; } + + void SetBinning(Int_t i, Axis_t lo, Axis_t up) { fNbins=i; fFirst=lo; fLast=up; } // Simulates Index: trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc (revision 8338) +++ trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc (revision 8339) @@ -157,7 +157,5 @@ SetLoGain(kFALSE); - SetNbins(fgNbins); - SetFirst(fgFirst); - SetLast (fgLast ); + SetBinning(fgNbins, fgFirst, fgLast); SetHistName (gsHistName .Data()); @@ -374,9 +372,5 @@ MHPedestalPix &pix = (MHPedestalPix&)(*this)[i]; - - pix.SetNbins(fNbins); - pix.SetFirst(fFirst); - pix.SetLast (fLast); - + pix.SetBinning(fNbins, fFirst, fLast); pix.SetProbLimit(fProbLimit); @@ -395,10 +389,9 @@ fAverageHiGainAreas->AddAt(new MHPedestalPix(Form("%sHiGainArea%d",fHistName.Data(),j), Form("%s High Gain Area Idx %d",fHistTitle.Data(),j)),j); - + MHPedestalPix &pix = (MHPedestalPix&)GetAverageHiGainArea(j); - - pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); - pix.SetFirst(fFirst); - pix.SetLast (fLast); + + pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas), + fFirst, fLast); InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j); @@ -416,7 +409,6 @@ MHPedestalPix &pix = (MHPedestalPix&)GetAverageHiGainSector(j); - pix.SetNbins(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas)); - pix.SetFirst(fFirst); - pix.SetLast (fLast); + pix.SetBinning(fNbins*(Int_t)TMath::Sqrt((Float_t)npixels/nareas), + fFirst, fLast); InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j); Index: trunk/MagicSoft/Mars/mmain/MEventDisplay.cc =================================================================== --- trunk/MagicSoft/Mars/mmain/MEventDisplay.cc (revision 8338) +++ trunk/MagicSoft/Mars/mmain/MEventDisplay.cc (revision 8339) @@ -1,4 +1,4 @@ /* ======================================================================== *\ -! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.57 2007-01-29 12:51:17 tbretz Exp $ +! $Name: not supported by cvs2svn $:$Id: MEventDisplay.cc,v 1.58 2007-03-01 17:39:59 tbretz Exp $ ! -------------------------------------------------------------------------- ! @@ -336,5 +336,6 @@ tlist->AddToList(clean); tlist->AddToList(fill02); - tlist->AddToList(fill03); + if (type==2) + tlist->AddToList(fill03); tlist->AddToList(fill04); tlist->AddToList(fill06a);