Changeset 5083 for trunk/MagicSoft


Ignore:
Timestamp:
09/16/04 17:23:07 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r5080 r5083  
    100100   * mimage/MHillasSrc.[h,cc]:
    101101     - fixed a bug in the output of DCA (wrong units)
     102
     103   * mhcalib/MHCalibrationChargeBlindCam.[h,cc],
     104     mhcalib/MHCalibrationChargeBlindPix.cc,
     105     mhcalib/MHCalibrationChargeCam.[h,cc],
     106     mhcalib/MHCalibrationChargePINDiode.[h,cc],
     107     mhcalib/MHCalibrationRelTimeCam.[h,cc],
     108     mhcalib/MHGausEvents.[h,cc]:
     109     - took out the Clone-functions. Everything here seems to be
     110       a lot more stable without. I guess it is due to the change
     111       away from the TClonesArrays which makes the automatic
     112       streamed cloning work fine.
     113     - moved the removing of TF1 from the destructor to the
     114       allocation of the objects. It seems that already before the
     115       destructor can remove the objects from these list 'shit happens'
    102116
    103117

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc

    r5050 r5083  
    414414// Deletes the TObjArray's and Clones them individually
    415415//
     416#if 0
    416417TObject *MHCalibrationChargeBlindCam::Clone(const char *name) const
    417418{
    … …  
    442443  return cam;
    443444}
     445#endif
    444446
    445447// -----------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.h

    r5050 r5083  
    4848
    4949  // Clone
    50   TObject *Clone(const char *name="") const;
     50  //TObject *Clone(const char *name="") const;
    5151 
    5252  // Draw

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindPix.cc

    r5071 r5083  
    154154
    155155  if (fSinglePheFit)
    156     {
    157       gROOT->GetListOfFunctions()->Remove(fSinglePheFit);
    158156      delete fSinglePheFit;
    159     }
    160157 
    161158  if (fFitLegend)
    … …  
    556553      return kFALSE;
    557554  }
     555
     556  gROOT->GetListOfFunctions()->Remove(fSinglePheFit);
    558557 
    559558  const Double_t mu_0_guess = 13.5;

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

    r5029 r5083  
    12841284//  -  (*cam)[100].DrawClone()
    12851285//
     1286#if 0
    12861287TObject *MHCalibrationChargeCam::Clone(const char *name) const
    12871288{
    … …  
    13381339
    13391340}
     1341#endif
    13401342
    13411343// -----------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.h

    r5014 r5083  
    105105  ~MHCalibrationChargeCam() {}
    106106 
    107   TObject *Clone(const char *name="") const;
     107  //TObject *Clone(const char *name="") const;
    108108
    109109  void SetLoGainNbins       ( const Int_t  i )       { fLoGainNbins   = i; }

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.cc

    r4950 r5083  
    200200// the rest of the data members.
    201201//
     202#if 0
    202203TObject *MHCalibrationChargePINDiode::Clone(const char *name) const
    203204{
    … …  
    221222  return &pix;
    222223}
    223 
     224#endif
    224225
    225226// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargePINDiode.h

    r4950 r5083  
    6666  ~MHCalibrationChargePINDiode(){}
    6767
    68   TObject *Clone(const char* name="") const; 
     68//  TObject *Clone(const char* name="") const;
    6969 
    7070  Bool_t SetupFill(const MParList *pList);

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

    r5014 r5083  
    175175// Creates new MHCalibrationRelTimeCam
    176176//
     177#if 0
    177178TObject *MHCalibrationRelTimeCam::Clone(const char *name) const
    178179{
    … …  
    223224
    224225}
     226#endif
    225227
    226228// --------------------------------------------------------------------------

  • trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h

    r4963 r5083  
    5555  ~MHCalibrationRelTimeCam() {}
    5656
    57   TObject *Clone(const char *name="") const;
     57  //TObject *Clone(const char *name="") const;
    5858
    5959  UInt_t GetReferencePixel() const { return fReferencePixel; }

  • trunk/MagicSoft/Mars/mhcalib/MHGausEvents.cc

    r5070 r5083  
    185185  // delete fits
    186186  if (fFGausFit)
    187     {
    188       gROOT->GetListOfFunctions()->Remove(fFGausFit);
    189187      delete fFGausFit;
    190     }
    191188 
    192189  if (fFExpFit)
    193     {
    194       gROOT->GetListOfFunctions()->Remove(fFExpFit);
    195190      delete fFExpFit;
    196     }
    197191 
    198192  // delete arrays
    … …  
    282276// data members.
    283277//
     278#if 0
    284279TObject *MHGausEvents::Clone(const char *name) const
    285280{
    … …  
    329324  return &pix;
    330325}
    331 
     326#endif
    332327
    333328// -----------------------------------------------------------------------------
    … …  
    416411  const Double_t offset_guess = slope_guess*xmax;
    417412
     413  gROOT->GetListOfFunctions()->Remove(fFExpFit);
    418414  fFExpFit->SetParameters(offset_guess, slope_guess);
    419415  fFExpFit->SetParNames("Offset","Slope");
    … …  
    723719    }
    724720 
     721  gROOT->GetListOfFunctions()->Remove(fFGausFit);
    725722  fFGausFit->SetParameters(area_guess,mu_guess,sigma_guess);
    726723  fFGausFit->SetParNames("Area","#mu","#sigma");

  • trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h

    r4994 r5083  
    7676  ~MHGausEvents();
    7777
    78   TObject *Clone(const char* name="") const;
     78  //TObject *Clone(const char* name="") const;
    7979 
    8080  void Clear(Option_t *o="");
Note: See TracChangeset for help on using the changeset viewer.