Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (revision 5098) @@ -337,89 +337,4 @@ // -------------------------------------------------------------------------- // -// Creates new MHCalibrationCam only for the averaged areas: -// the rest has to be retrieved directly, e.g. via: -// MHCalibrationCam *cam = MParList::FindObject("MHCalibrationCam"); -// - cam->GetAverageSector(5).DrawClone(); -// - (*cam)[100].DrawClone() -// -TObject *MHCalibrationCam::Clone(const char *) const -{ - - // - // FIXME, this might be done faster and more elegant, by direct copy. - // - MHCalibrationCam *cam = (MHCalibrationCam*)this->Clone(); - - cam->fRunNumbers = fRunNumbers; - - /* - cam->fPulserFrequency = fPulserFrequency; - cam->fFlags = fFlags; - cam->fNbins = fNbins; - cam->fFirst = fFirst; - cam->fLast = fLast; - */ - if (!IsAverageing()) - return cam; - - // const Int_t nhi = fHiGainArray->GetEntries(); - // const Int_t nlo = fLoGainArray->GetEntries(); - const Int_t navhi = fAverageHiGainAreas->GetEntries(); - // const Int_t nsehi = fAverageHiGainSectors->GetEntries(); - - // cam->fHiGainArray->Expand(nhi); - // cam->fLoGainArray->Expand(nlo); - cam->fAverageHiGainAreas->Expand(navhi); - // cam->fAverageHiGainSectors->Expand(nsehi); - // cam->fAverageLoGainSectors->Expand(nselo); - - /* - for (int i=0; ifHiGainArray)[i]; - (*cam->fHiGainArray)[i] = (*fHiGainArray)[i]->Clone(); - } - for (int i=0; ifLoGainArray)[i]; - (*cam->fLoGainArray)[i] = (*fLoGainArray)[i]->Clone(); - } - */ - - for (int i=0; ifAverageHiGainAreas)[i] = (*fAverageHiGainAreas)[i]->Clone(); - - // for (int i=0; ifAverageHiGainSectors)[i] = (*fAverageHiGainSectors)[i]->Clone(); - - if (IsLoGain()) - { - - const Int_t navlo = fAverageLoGainAreas->GetEntries(); - - cam->fAverageLoGainAreas->Expand(navlo); - // cam->fAverageLoGainSectors->Expand(nselo); - // const Int_t nselo = fAverageLoGainSectors->GetEntries(); - - for (int i=0; ifAverageLoGainAreas)[i] = (*fAverageLoGainAreas)[i]->Clone(); - - // for (int i=0; ifAverageLoGainSectors)[i] = (*fAverageLoGainSectors)[i]->Clone(); - } - - cam->fAverageAreaNum = fAverageAreaNum; - cam->fAverageAreaSat = fAverageAreaSat; - cam->fAverageAreaSigma = fAverageAreaSigma; - cam->fAverageAreaSigmaVar = fAverageAreaSigmaVar; - cam->fAverageAreaRelSigma = fAverageAreaRelSigma; - cam->fAverageAreaRelSigmaVar = fAverageAreaRelSigmaVar; - cam->fAverageSectorNum = fAverageSectorNum; - - return cam; -} - -// -------------------------------------------------------------------------- -// // Gets the pointers to: // - MGeomCam Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h (revision 5098) @@ -154,7 +154,4 @@ virtual void ResetHists(); - // Clone - TObject *Clone(const char *name="") const; - // Draw void Draw(const Option_t *opt); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc (revision 5098) @@ -405,40 +405,4 @@ } - -// -------------------------------------------------------------------------- -// -// This Clone-function has to be different from the MHCalibrationCam -// Clone function since it does not store and display the averaged values -// (in fAverageAreas), but the blind pixels stored in fHiGainArray. -// -// Creates new MHCalibrationChargeBlindCam and -// Clones MHCalibrationChargeBlindPix's individually -// -TObject *MHCalibrationChargeBlindCam::Clone(const char *name) const -{ - - MHCalibrationChargeBlindCam *cam = new MHCalibrationChargeBlindCam(); - - // - // Copy the data members - // - cam->fRunNumbers = fRunNumbers; - cam->fPulserFrequency = fPulserFrequency; - cam->fFlags = fFlags; - cam->fNbins = fNbins; - cam->fFirst = fFirst; - cam->fLast = fLast; - cam->fFitFunc = fFitFunc; - - const Int_t nhi = fHiGainArray->GetEntries(); - - cam->fHiGainArray->Expand(nhi); - - for (int i=0; ifHiGainArray)[i] = (*fHiGainArray)[i]->Clone(); - - return cam; -} - // ----------------------------------------------------------------------------- // Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.h (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.h (revision 5098) @@ -47,7 +47,4 @@ MHCalibrationChargeBlindCam(const char *name=NULL, const char *title=NULL); - // Clone - TObject *Clone(const char *name="") const; - // Draw void Draw(Option_t *opt=""); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc (revision 5098) @@ -231,100 +231,4 @@ } -#if 0 -// -------------------------------------------------------------------------- -// -// ATTENTION: This nasty Clone function is necessary since the ROOT cloning -// lead to crashes on SOME machines (unfortunately not mine...). -// This function is a workaround in order to achieve the correct -// DrawClone() behaviour. -// -TObject *MHCalibrationChargeBlindPix::Clone(const char *name) const -{ - - MHCalibrationChargeBlindPix &pix = - *new MHCalibrationChargeBlindPix(name ? name : fName.Data(),fTitle.Data()); - - // - // Copy MHGausEvents data members - // - pix.fBinsAfterStripping = fBinsAfterStripping; - pix.fCurrentSize = fCurrentSize; - pix.fFlags = fFlags; - pix.fPowerProbabilityBins = fPowerProbabilityBins; - - if (fHPowerProbability) - pix.fHPowerProbability=(TH1I*)fHPowerProbability->Clone(); - - if (fPowerSpectrum) - pix.fPowerSpectrum = new TArrayF(*fPowerSpectrum); - - pix.fEvents = fEvents; - - if (fFGausFit) - pix.fFGausFit=(TF1*)fFGausFit->Clone(); - if (fFExpFit) - pix.fFExpFit=(TF1*)fFExpFit->Clone(); - - pix.fFirst = fFirst; - - if (fGraphEvents) - pix.fGraphEvents=(TGraph*)fGraphEvents->Clone(); - if (fGraphPowerSpectrum) - pix.fGraphPowerSpectrum=(TGraph*)fGraphPowerSpectrum->Clone(); - - pix.fHGausHist = fHGausHist; - - pix.fLast = fLast; - pix.fMean = fMean; - pix.fMeanErr = fMeanErr; - pix.fNbins = fNbins; - pix.fNDFLimit = fNDFLimit; - pix.fSigma = fSigma; - pix.fSigmaErr = fSigmaErr; - pix.fProb = fProb; - pix.fProbLimit = fProbLimit; - - // - // Copy MHCalibrationPix data members - // - pix.fEventFrequency = fEventFrequency; - pix.fBlackoutLimit = fBlackoutLimit; - pix.fSaturated = fSaturated; - pix.fPickupLimit = fPickupLimit; - pix.fPixId = fPixId; - - // - // Copy MHCalibrationChargeBlindPix data members - // - pix.fSinglePheCut = fSinglePheCut; - pix.fNumSinglePheLimit = fNumSinglePheLimit; - - fASinglePheFADCSlices.Copy(pix.fASinglePheFADCSlices); - fAPedestalFADCSlices.Copy( pix.fAPedestalFADCSlices); - - pix.fSinglePheFit = (TF1*)fSinglePheFit->Clone(); - - pix.fNumSinglePhes = fNumSinglePhes; - pix.fNumPedestals = fNumPedestals; - pix.fLambda = fLambda; - pix.fLambdaCheck = fLambdaCheck; - pix.fMu0 = fMu0; - pix.fMu1 = fMu1; - pix.fSigma0 = fSigma0; - pix.fSigma1 = fSigma1; - pix.fLambdaErr = fLambdaErr; - pix.fLambdaCheckErr = fLambdaCheckErr; - pix.fMu0Err = fMu0Err; - pix.fMu1Err = fMu1Err; - pix.fSigma0Err = fSigma0Err; - pix.fSigma1Err = fSigma1Err; - pix.fChisquare = fChisquare; - pix.fNDF = fNDF; - pix.fProb = fProb; - - return &pix; -} -#endif - /* // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.h (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.h (revision 5098) @@ -88,6 +88,4 @@ void Reset() {} - // TObject *Clone(const char *) const; - // Getters const Double_t GetLambda () const { return fLambda; } Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc (revision 5098) @@ -1272,73 +1272,4 @@ } - -// -------------------------------------------------------------------------- -// -// Our own clone function is necessary since root 3.01/06 or Mars 0.4 -// I don't know the reason. -// -// Creates new MHCalibrationChargeCam only for the Averaged Areas, -// the rest has to be retrieved directly, e.g. via: -// MHCalibrationChargeCam *cam = MParList::FindObject("MHCalibrationChargeCam"); -// - cam->GetAverageSector(5).DrawClone(); -// - (*cam)[100].DrawClone() -// -#if 0 -TObject *MHCalibrationChargeCam::Clone(const char *name) const -{ - - const Int_t navhi = fAverageHiGainAreas->GetEntries(); - // const Int_t nsehi = fAverageHiGainSectors->GetEntries(); - // const Int_t nselo = fAverageLoGainSectors->GetEntries(); - - // - // FIXME, this might be done faster and more elegant, by direct copy. - // - MHCalibrationChargeCam *cam = new MHCalibrationChargeCam(); - - cam->fColor = fColor; - cam->fPulserFrequency = fPulserFrequency; - cam->fFlags = fFlags; - cam->fRunNumbers = fRunNumbers; - cam->fNbins = fNbins; - cam->fFirst = fFirst; - cam->fLast = fLast; - - if (!IsAverageing()) - return cam; - - cam->fAverageHiGainAreas->Expand(navhi); - - for (int i=0; ifAverageHiGainAreas) [i] = (*fAverageHiGainAreas) [i]->Clone(); - // cam->fAverageHiGainSectors->Expand(nsehi); - // for (int i=0; ifAverageHiGainSectors)[i] = (*fAverageHiGainSectors)[i]->Clone(); - - if (IsLoGain()) - { - const Int_t navlo = fAverageLoGainAreas->GetEntries(); - cam->fAverageLoGainAreas->Expand(navlo); - - for (int i=0; ifAverageLoGainAreas) [i] = (*fAverageLoGainAreas) [i]->Clone(); - // cam->fAverageLoGainSectors->Expand(nselo); - // for (int i=0; ifAverageLoGainSectors)[i] = (*fAverageLoGainSectors)[i]->Clone(); - } - - cam->fAverageAreaNum = fAverageAreaNum; - cam->fAverageAreaSat = fAverageAreaSat; - cam->fAverageAreaSigma = fAverageAreaSigma; - cam->fAverageAreaSigmaVar = fAverageAreaSigmaVar; - cam->fAverageAreaRelSigma = fAverageAreaRelSigma; - cam->fAverageAreaRelSigmaVar = fAverageAreaRelSigmaVar; - cam->fAverageSectorNum = fAverageSectorNum; - - return cam; - -} -#endif - // ----------------------------------------------------------------------------- // Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.h (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.h (revision 5098) @@ -105,6 +105,4 @@ ~MHCalibrationChargeCam() {} - //TObject *Clone(const char *name="") const; - void SetLoGainNbins ( const Int_t i ) { fLoGainNbins = i; } void SetLoGainFirst ( const Axis_t f ) { fLoGainFirst = f; } Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc (revision 5098) @@ -197,33 +197,4 @@ // -------------------------------------------------------------------------- // -// Use the MHCalibrationChargePix::Clone function and clone additionally -// the rest of the data members. -// -#if 0 -TObject *MHCalibrationChargePINDiode::Clone(const char *name) const -{ - - MHCalibrationChargePINDiode &pix = (MHCalibrationChargePINDiode&)*MHCalibrationChargePix::Clone(name); - // - // Copy data members - // - pix.fHRmsCharge = fHRmsCharge; - - pix.fRmsChargeFirst = fRmsChargeFirst; - pix.fRmsChargeLast = fRmsChargeLast; - pix.fRmsChargeNbins = fRmsChargeNbins; - pix.fRmsChargeMean = fRmsChargeMean; - pix.fRmsChargeMeanErr = fRmsChargeMeanErr; - pix.fRmsChargeSigma = fRmsChargeSigma; - pix.fRmsChargeSigmaErr = fRmsChargeSigmaErr; - pix.fTimeLowerLimit = fTimeLowerLimit; - pix.fTimeUpperLimit = fTimeUpperLimit; - - return &pix; -} -#endif - -// -------------------------------------------------------------------------- -// // Gets or creates the pointers to: // - MExtractedSignalPINDiode Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.h (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.h (revision 5098) @@ -66,6 +66,4 @@ ~MHCalibrationChargePINDiode(){} -// TObject *Clone(const char* name="") const; - Bool_t SetupFill(const MParList *pList); Bool_t ReInit ( MParList *pList); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.cc (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.cc (revision 5098) @@ -80,75 +80,4 @@ } - -#if 0 -// -------------------------------------------------------------------------- -// -// ATTENTION: This nasty Clone function is necessary since the ROOT cloning -// lead to crashes on SOME machines (unfortunately not mine...). -// This function is a workaround in order to achieve the correct -// DrawClone() behaviour. -// -TObject *MHCalibrationChargePix::Clone(const char *name) const -{ - - MHCalibrationChargePix &pix = - *new MHCalibrationChargePix(name ? name : fName.Data(),fTitle.Data()); - // - // Copy MHGausEvents data members - // - pix.fBinsAfterStripping = fBinsAfterStripping; - pix.fCurrentSize = fCurrentSize; - pix.fFlags = fFlags; - pix.fPowerProbabilityBins = fPowerProbabilityBins; - - if (fHPowerProbability) - pix.fHPowerProbability=(TH1I*)fHPowerProbability->Clone(); - - if (fPowerSpectrum) - pix.fPowerSpectrum = new TArrayF(*fPowerSpectrum); - - pix.fEvents = fEvents; - - if (fFGausFit) - pix.fFGausFit=(TF1*)fFGausFit->Clone(); - if (fFExpFit) - pix.fFExpFit=(TF1*)fFExpFit->Clone(); - - pix.fFirst = fFirst; - - if (fGraphEvents) - pix.fGraphEvents=(TGraph*)fGraphEvents->Clone(); - if (fGraphPowerSpectrum) - pix.fGraphPowerSpectrum=(TGraph*)fGraphPowerSpectrum->Clone(); - - pix.fHGausHist = fHGausHist; - - pix.fLast = fLast; - pix.fMean = fMean; - pix.fMeanErr = fMeanErr; - pix.fNbins = fNbins; - pix.fNDFLimit = fNDFLimit; - pix.fSigma = fSigma; - pix.fSigmaErr = fSigmaErr; - pix.fProb = fProb; - pix.fProbLimit = fProbLimit; - - // - // Copy MHCalibrationPix data members - // - pix.fEventFrequency = fEventFrequency; - pix.fBlackoutLimit = fBlackoutLimit; - pix.fSaturated = fSaturated; - pix.fPickupLimit = fPickupLimit; - pix.fPixId = fPixId; - - // - // Copy MHCalibrationChargePix data members - // - pix.fHAbsTime = fHAbsTime; - - return &pix; -} -#endif // -------------------------------------------------------------------------- Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.h (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePix.h (revision 5098) @@ -21,6 +21,4 @@ MHCalibrationChargePix(const char *name=NULL, const char *title=NULL); ~MHCalibrationChargePix() {} - - // TObject *Clone(const char* name="") const; void Reset(); Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationPix.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationPix.cc (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationPix.cc (revision 5098) @@ -92,70 +92,4 @@ } - -#if 0 -// -------------------------------------------------------------------------- -// -// ATTENTION: This nasty Clone function is necessary since the ROOT cloning -// lead to crashes on SOME machines (unfortunately not mine...). -// This function is a workaround in order to achieve the correct -// DrawClone() behaviour. -// -TObject *MHCalibrationPix::Clone(const char *name) const -{ - - MHCalibrationPix &pix = *new MHCalibrationPix(name ? name : fName.Data(),fTitle.Data()); - - // - // Copy MHGausEvents data members - // - pix.fBinsAfterStripping = fBinsAfterStripping; - pix.fCurrentSize = fCurrentSize; - pix.fFlags = fFlags; - pix.fPowerProbabilityBins = fPowerProbabilityBins; - - if (fHPowerProbability) - pix.fHPowerProbability=(TH1I*)fHPowerProbability->Clone(); - - if (fPowerSpectrum) - pix.fPowerSpectrum = new TArrayF(*fPowerSpectrum); - - pix.fEvents = fEvents; - - if (fFGausFit) - pix.fFGausFit=(TF1*)fFGausFit->Clone(); - if (fFExpFit) - pix.fFExpFit=(TF1*)fFExpFit->Clone(); - - pix.fFirst = fFirst; - - if (fGraphEvents) - pix.fGraphEvents=(TGraph*)fGraphEvents->Clone(); - if (fGraphPowerSpectrum) - pix.fGraphPowerSpectrum=(TGraph*)fGraphPowerSpectrum->Clone(); - - pix.fHGausHist = fHGausHist; - - pix.fLast = fLast; - pix.fMean = fMean; - pix.fMeanErr = fMeanErr; - pix.fNbins = fNbins; - pix.fNDFLimit = fNDFLimit; - pix.fSigma = fSigma; - pix.fSigmaErr = fSigmaErr; - pix.fProb = fProb; - pix.fProbLimit = fProbLimit; - - // - // Copy data members - // - pix.fBlackoutLimit = fBlackoutLimit; - pix.fSaturated = fSaturated; - pix.fPickupLimit = fPickupLimit; - pix.fPixId = fPixId; - - return &pix; -} -#endif - // ----------------------------------------------------------------------------- // Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationPix.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationPix.h (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationPix.h (revision 5098) @@ -27,6 +27,4 @@ void Clear(Option_t *o=""); - // TObject *Clone(const char* name="") const; - // Getters const Double_t GetBlackout () const; Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (revision 5098) @@ -170,62 +170,4 @@ // -------------------------------------------------------------------------- // -// Our own clone function is necessary since root 3.01/06 or Mars 0.4 -// I don't know the reason. -// -// Creates new MHCalibrationRelTimeCam -// -#if 0 -TObject *MHCalibrationRelTimeCam::Clone(const char *name) const -{ - - const Int_t navhi = fAverageHiGainAreas->GetEntries(); - const Int_t navlo = fAverageLoGainAreas->GetEntries(); - const Int_t nsehi = fAverageHiGainSectors->GetEntries(); - const Int_t nselo = fAverageLoGainSectors->GetEntries(); - - // - // FIXME, this might be done faster and more elegant, by direct copy. - // - MHCalibrationRelTimeCam *cam = new MHCalibrationRelTimeCam(); - - cam->fAverageHiGainAreas->Expand(navhi); - cam->fAverageHiGainSectors->Expand(nsehi); - - for (int i=0; ifAverageHiGainAreas) [i] = (*fAverageHiGainAreas) [i]->Clone(); - for (int i=0; ifAverageHiGainSectors)[i] = (*fAverageHiGainSectors)[i]->Clone(); - - if (IsLoGain()) - { - cam->fAverageLoGainAreas->Expand(navlo); - cam->fAverageLoGainSectors->Expand(nselo); - - for (int i=0; ifAverageLoGainAreas) [i] = (*fAverageLoGainAreas) [i]->Clone(); - for (int i=0; ifAverageLoGainSectors)[i] = (*fAverageLoGainSectors)[i]->Clone(); - } - - cam->fAverageAreaNum = fAverageAreaNum; - cam->fAverageAreaSat = fAverageAreaSat; - cam->fAverageAreaSigma = fAverageAreaSigma; - cam->fAverageAreaSigmaVar = fAverageAreaSigmaVar; - cam->fAverageAreaRelSigma = fAverageAreaRelSigma; - cam->fAverageAreaRelSigmaVar = fAverageAreaRelSigmaVar; - cam->fAverageSectorNum = fAverageSectorNum; - cam->fRunNumbers = fRunNumbers; - - cam->fColor = fColor; - cam->fPulserFrequency = fPulserFrequency; - cam->fFlags = fFlags; - - return cam; - -} -#endif - -// -------------------------------------------------------------------------- -// // Gets or creates the pointers to: // - MCalibrationRelTimeCam Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h (revision 5098) @@ -55,6 +55,4 @@ ~MHCalibrationRelTimeCam() {} - //TObject *Clone(const char *name="") const; - UInt_t GetReferencePixel() const { return fReferencePixel; } Index: trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc (revision 5098) @@ -265,59 +265,4 @@ } -// -------------------------------------------------------------------------- -// -// Use the MH::Clone function and clone additionally the rest of the -// data members. -// -#if 0 -TObject *MHGausEvents::Clone(const char *name) const -{ - - MHGausEvents &pix = (MHGausEvents&)*MH::Clone(name); - - /* - // - // Copy data members - // - pix.fBinsAfterStripping = fBinsAfterStripping; - pix.fCurrentSize = fCurrentSize; - pix.fFlags = fFlags; - pix.fPowerProbabilityBins = fPowerProbabilityBins; - - if (fHPowerProbability) - pix.fHPowerProbability=(TH1I*)fHPowerProbability->Clone(); - - if (fPowerSpectrum) - pix.fPowerSpectrum = new TArrayF(*fPowerSpectrum); - - if (fFGausFit) - pix.fFGausFit=(TF1*)fFGausFit->Clone(); - if (fFExpFit) - pix.fFExpFit=(TF1*)fFExpFit->Clone(); - - pix.fFirst = fFirst; - - if (fGraphEvents) - pix.fGraphEvents=(TGraph*)fGraphEvents->Clone(); - if (fGraphPowerSpectrum) - pix.fGraphPowerSpectrum=(TGraph*)fGraphPowerSpectrum->Clone(); - - pix.fHGausHist = fHGausHist; - - pix.fEventFrequency = fEventFrequency; - pix.fLast = fLast; - pix.fMean = fMean; - pix.fMeanErr = fMeanErr; - pix.fNbins = fNbins; - pix.fNDFLimit = fNDFLimit; - pix.fSigma = fSigma; - pix.fSigmaErr = fSigmaErr; - pix.fProb = fProb; - pix.fProbLimit = fProbLimit; - */ - return &pix; -} -#endif - // ----------------------------------------------------------------------------- // Index: trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h =================================================================== --- trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h (revision 5097) +++ trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h (revision 5098) @@ -76,6 +76,4 @@ ~MHGausEvents(); - //TObject *Clone(const char* name="") const; - void Clear(Option_t *o=""); void Reset();