Changeset 4442 for trunk/MagicSoft


Ignore:
Timestamp:
08/03/04 15:31:23 (20 years ago)
Author:
aliu
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mtemp/mifae
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/mtemp/mifae/Changelog

    r4439 r4442  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2004/08/03 Ester Aliu Fusté
     22    * library/MIslands.[h, cc], MIslandCalc.[h,cc]
     23     - Add the delete for the pointers 
    2024
    2125  2004/08/02 Ester Aliu Fusté
  • trunk/MagicSoft/Mars/mtemp/mifae/library/MIslandCalc.cc

    r4439 r4442  
    228228        if (i == 0)
    229229          fIsl->SetIslId(idx, -1);
    230         fIsl->SetArrivalTime(i, idx, -1 );
     230        //fIsl->SetArrivalTime(i, idx, -1 );
    231231      }
    232232  }
     
    297297           
    298298            fIsl->SetIslId(idx, i-1);
    299             fIsl->SetArrivalTime(i-1, idx, time[n]);
     299            //  fIsl->SetArrivalTime(i-1, idx, time[n]);
    300300
    301301            n++;
     
    406406  fIsl->SetReadyToSave();
    407407
    408   /*delete [] vect;
    409   delete [] num;
    410   delete [] ftime;
    411   delete [] fIslId;
    412   */
     408   
     409  for(Int_t i=0;i<nVect;i++)
     410    delete [] vect[i];
     411
     412  delete vect;
     413
    413414  return kTRUE; 
    414415}
  • trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.cc

    r4439 r4442  
    3030MIslands::~MIslands()
    3131{
    32  
     32  delete fPixNum;
     33  delete fSigToNoise;
     34  delete fTimeSpread;
     35  delete fMeanX;
     36  delete fMeanY;
     37  delete fDist;
     38  delete fDistL;
     39  delete fDistW;
    3340}
    3441
  • trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.h

    r4439 r4442  
    2929    Float_t* fSigToNoise;      //[fIslNum]  signal to noise of the island
    3030    //  Float_t** fTime;       //[fIslNum]  mean of the arrival time
    31     Float_t fTime[10][577];        //  mean of the arrival time
     31    // Float_t fTime[10][577];        //  mean of the arrival time
    3232    Float_t* fTimeSpread;      //[fIslNum]  mean arrival time spread of the core pixels of the island 
    3333    Float_t* fMeanX;           //[fIslNum]  mean X position of the island
     
    5151    //Int_t    GetIslId(Int_t isl, Int_t idx)  { return fIslId[isl][idx]; }
    5252    // TObjArray GetIslId()                    {return fIslId;}
    53     Float_t  GetArrivalTime(Int_t isl, Int_t idx) { return fTime[isl][idx]; }     
     53    //  Float_t  GetArrivalTime(Int_t isl, Int_t idx) { return fTime[isl][idx]; }     
    5454    //TObjArray GetArrivalTime()               { return fTime; }     
    5555    Int_t    GetPixNum(Int_t isl)            { return fPixNum[isl]; }
     
    7070   
    7171    // void     SetIslId(Int_t** vect)           { fIslId = vect; }
    72     void     SetArrivalTime(Int_t isl, Int_t idx, Float_t val)   { fTime[isl][idx] = val;}
     72    // void     SetArrivalTime(Int_t isl, Int_t idx, Float_t val)   { fTime[isl][idx] = val;}
    7373    //  void     SetArrivalTime(Float_t** vect)   { fTime = vect;}
    7474    void     SetPixNum(Int_t* npix)          { fPixNum = npix; }
Note: See TracChangeset for help on using the changeset viewer.