Ignore:
Timestamp:
12/03/04 20:11:31 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

    r5480 r5557  
    631631// arr[1]: Error (rms) of averaged conversion factors (default: 0.)
    632632//
    633 // ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
    634 //
    635 TArrayF *MCalibrationChargeCam::GetAveragedConvFADC2PhotPerArea  ( const MGeomCam &geom, const MCalibrationQECam &qecam,
     633TArrayF MCalibrationChargeCam::GetAveragedConvFADC2PhotPerArea  ( const MGeomCam &geom, const MCalibrationQECam &qecam,
    636634                                           const UInt_t ai,  MBadPixelsCam *bad)
    637635{
    … …  
    667665    }
    668666
    669   TArrayF *arr = new TArrayF(2);
    670   arr->AddAt(nr   ? mean/nr : -1.,0);
    671   arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
     667  TArrayF arr(2);
     668  arr[0] = nr   ? mean/nr : -1;
     669  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
    672670
    673671  return arr;
    … …  
    687685// arr[1]: Error (rms) of averaged conversion factors (default: 0.)
    688686//
    689 // ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
    690 //
    691 TArrayF *MCalibrationChargeCam::GetAveragedConvFADC2PhotPerSector( const MGeomCam &geom, const MCalibrationQECam &qecam,
     687TArrayF MCalibrationChargeCam::GetAveragedConvFADC2PhotPerSector( const MGeomCam &geom, const MCalibrationQECam &qecam,
    692688                                             const UInt_t sec, MBadPixelsCam *bad)
    693689{
    … …  
    722718    }
    723719
    724   TArrayF *arr = new TArrayF(2);
    725   arr->AddAt(nr   ? mean/nr : -1.,0);
    726   arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
    727 
     720  TArrayF arr(2);
     721  arr[0] = nr   ? mean/nr : -1;
     722  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
    728723  return arr;
    729724} 
    … …  
    741736// arr[1]: Error (rms) of averaged mean arrival times (default: 0.)
    742737//
    743 // ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
    744 //
    745 TArrayF *MCalibrationChargeCam::GetAveragedArrivalTimeMeanPerArea  ( const MGeomCam &geom,
    746                                            const UInt_t ai,  MBadPixelsCam *bad)
     738TArrayF MCalibrationChargeCam::GetAveragedArrivalTimeMeanPerArea(const MGeomCam &geom,
     739                                                                 const UInt_t ai,  MBadPixelsCam *bad)
    747740{
    748741
    … …  
    772765    }
    773766
    774   TArrayF *arr = new TArrayF(2);
    775   arr->AddAt(nr   ? mean/nr : -1.,0);
    776   arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
    777 
     767  TArrayF arr(2);
     768  arr[0] = nr   ? mean/nr : -1;
     769  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
    778770  return arr;
    779771}
    … …  
    791783// arr[1]: Error (rms) of averaged mean arrival times (default: 0.)
    792784//
    793 // ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
    794 //
    795 TArrayF *MCalibrationChargeCam::GetAveragedArrivalTimeMeanPerSector( const MGeomCam &geom,
    796                                              const UInt_t sec, MBadPixelsCam *bad)
     785TArrayF MCalibrationChargeCam::GetAveragedArrivalTimeMeanPerSector(const MGeomCam &geom,
     786                                                                   const UInt_t sec, MBadPixelsCam *bad)
    797787{
    798788  const Int_t np = GetSize();
    … …  
    821811    }
    822812
    823   TArrayF *arr = new TArrayF(2);
    824   arr->AddAt(nr   ? mean/nr : -1.,0);
    825   arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
    826 
     813  TArrayF arr(2);
     814  arr[0] = nr   ? mean/nr : -1;
     815  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
    827816  return arr;
    828817} 
    … …  
    840829// arr[1]: Error (rms) of averaged arrival time RMSs (default: 0.)
    841830//
    842 // ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
    843 //
    844 TArrayF *MCalibrationChargeCam::GetAveragedArrivalTimeRmsPerArea  ( const MGeomCam &geom,
    845                                            const UInt_t ai,  MBadPixelsCam *bad)
     831TArrayF MCalibrationChargeCam::GetAveragedArrivalTimeRmsPerArea  ( const MGeomCam &geom,
     832                                                                   const UInt_t ai,  MBadPixelsCam *bad)
    846833{
    847834
    … …  
    871858    }
    872859
    873   TArrayF *arr = new TArrayF(2);
    874   arr->AddAt(nr   ? mean/nr : -1.,0);
    875   arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
    876 
     860  TArrayF arr(2);
     861  arr[0] = nr   ? mean/nr : -1;
     862  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
    877863  return arr;
    878864}
    … …  
    890876// arr[1]: Error (rms) of averaged arrival time RMSs (default: 0.)
    891877//
    892 // ATTENTION: THE USER HAS TO DELETE THE RETURNED TARRAYF ACCORDINGLY
    893 //
    894 TArrayF *MCalibrationChargeCam::GetAveragedArrivalTimeRmsPerSector( const MGeomCam &geom, const UInt_t sec, MBadPixelsCam *bad)
     878TArrayF MCalibrationChargeCam::GetAveragedArrivalTimeRmsPerSector( const MGeomCam &geom, const UInt_t sec, MBadPixelsCam *bad)
    895879{
    896880  const Int_t np = GetSize();
    … …  
    918902    }
    919903
    920   TArrayF *arr = new TArrayF(2);
    921   arr->AddAt(nr   ? mean/nr : -1.,0);
    922   arr->AddAt(nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0. ,1);
     904  TArrayF arr(2);
     905  arr[0] = nr   ? mean/nr : -1;
     906  arr[1] = nr>1 ? TMath::Sqrt((mean2 - mean*mean/nr)/(nr-1)) : 0;
    923907
    924908  return arr;
Note: See TracChangeset for help on using the changeset viewer.