Changeset 4442 for trunk

Timestamp:

08/03/04 15:31:23 (20 years ago)

Author:

aliu

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• Changelog (modified) (1 diff)
• library/MIslandCalc.cc (modified) (3 diffs)
• library/MIslands.cc (modified) (1 diff)
• library/MIslands.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/08/03 Ester Aliu Fusté
+    * library/MIslands.[h, cc], MIslandCalc.[h,cc]
+     - Add the delete for the pointers  
 
   2004/08/02 Ester Aliu Fusté

trunk/MagicSoft/Mars/mtemp/mifae/library/MIslandCalc.cc

@@ -228 +228 @@
         if (i == 0)
           fIsl->SetIslId(idx, -1);
-        fIsl->SetArrivalTime(i, idx, -1 );
+        //fIsl->SetArrivalTime(i, idx, -1 );
       }
   }
@@ -297 +297 @@
             
             fIsl->SetIslId(idx, i-1);
-            fIsl->SetArrivalTime(i-1, idx, time[n]);
+            //  fIsl->SetArrivalTime(i-1, idx, time[n]);
 
             n++;
@@ -406 +406 @@
   fIsl->SetReadyToSave();
 
-  /*delete [] vect;
-  delete [] num;
-  delete [] ftime;
-  delete [] fIslId;
-  */
+    
+  for(Int_t i=0;i<nVect;i++)
+    delete [] vect[i];
+
+  delete vect;
+
   return kTRUE;  
 }

trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.cc

@@ -30 +30 @@
 MIslands::~MIslands()
 {
- 
+  delete fPixNum;
+  delete fSigToNoise;
+  delete fTimeSpread;
+  delete fMeanX;
+  delete fMeanY;
+  delete fDist;
+  delete fDistL;
+  delete fDistW;
 }
 

trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.h

@@ -29 +29 @@
     Float_t* fSigToNoise;      //[fIslNum]  signal to noise of the island
     //  Float_t** fTime;       //[fIslNum]  mean of the arrival time
-    Float_t fTime[10][577];        //  mean of the arrival time
+    // Float_t fTime[10][577];        //  mean of the arrival time
     Float_t* fTimeSpread;      //[fIslNum]  mean arrival time spread of the core pixels of the island  
     Float_t* fMeanX;           //[fIslNum]  mean X position of the island
@@ -51 +51 @@
     //Int_t    GetIslId(Int_t isl, Int_t idx)  { return fIslId[isl][idx]; }
     // TObjArray GetIslId()                    {return fIslId;}
-    Float_t  GetArrivalTime(Int_t isl, Int_t idx) { return fTime[isl][idx]; }     
+    //  Float_t  GetArrivalTime(Int_t isl, Int_t idx) { return fTime[isl][idx]; }     
     //TObjArray GetArrivalTime()               { return fTime; }     
     Int_t    GetPixNum(Int_t isl)            { return fPixNum[isl]; }
@@ -70 +70 @@
     
     // void     SetIslId(Int_t** vect)           { fIslId = vect; }
-    void     SetArrivalTime(Int_t isl, Int_t idx, Float_t val)   { fTime[isl][idx] = val;}
+    // void     SetArrivalTime(Int_t isl, Int_t idx, Float_t val)   { fTime[isl][idx] = val;}
     //  void     SetArrivalTime(Float_t** vect)   { fTime = vect;}
     void     SetPixNum(Int_t* npix)          { fPixNum = npix; }