Index: /trunk/MagicSoft/Mars/mtemp/mifae/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/mtemp/mifae/Changelog	(revision 4554)
+++ /trunk/MagicSoft/Mars/mtemp/mifae/Changelog	(revision 4555)
@@ -19,5 +19,5 @@
                                                  -*-*- END OF LINE -*-*-
 
-  2004/08/04 Javier Rico
+  2004/08/10 Ester Aliu
     * library/MIslands.[h,cc], MIslandCalc.[h,cc]
      - remove som bugs
Index: /trunk/MagicSoft/Mars/mtemp/mifae/library/MIslandCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mtemp/mifae/library/MIslandCalc.cc	(revision 4554)
+++ /trunk/MagicSoft/Mars/mtemp/mifae/library/MIslandCalc.cc	(revision 4555)
@@ -160,5 +160,5 @@
 
   const Int_t nPix=577;
-  const Int_t nVect=20;
+  const Int_t nVect=50;
   Int_t numisl;
 
@@ -228,5 +228,5 @@
 	if (i == 0)
 	  fIsl->SetIslId(idx, -1);
-	//fIsl->SetArrivalTime(i, idx, -1 );
+	fIsl->SetArrivalTime(i, idx, -1 );
       }
   }
@@ -297,5 +297,5 @@
 	    
 	    fIsl->SetIslId(idx, i-1);
-	    //  fIsl->SetArrivalTime(i-1, idx, time[n]);
+	    fIsl->SetArrivalTime(i-1, idx, time[n]);
 
 	    n++;
@@ -318,4 +318,7 @@
       timeVariance[i-1] = MAX-MIN; 
       
+      //noise = 0, in the case of MC w/o noise
+      if (noise == 0) noise = 1;
+
       fSigToNoise[i-1]= (Float_t)signal/(Float_t)sqrt(noise);
       
@@ -406,9 +409,9 @@
   fIsl->SetReadyToSave();
 
-    
-  for(Int_t i=0;i<nVect;i++)
-    delete [] vect[i];
-
-  delete vect;
+ 
+  for (Int_t i = 0; i< nVect; i++)
+    delete [] vect[i]; 
+
+ delete vect;
 
   return kTRUE;  
@@ -443,5 +446,5 @@
     zeros[n] = 0;
   
-
+  //cout << "new event" <<endl;
   MCerPhotPix *pix;
 
@@ -458,4 +461,5 @@
       if( fEvt->IsPixelUsed(idx)) 
      	{
+	  //cout << idx <<endl;
 	  sflag = 0;
 	  
@@ -480,4 +484,5 @@
 	    {
 	      nvect++;
+	      // cout << "nvect " << nvect << endl;
 	      vect[nvect][idx] = 1;	     
 	    }
Index: /trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.cc
===================================================================
--- /trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.cc	(revision 4554)
+++ /trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.cc	(revision 4555)
@@ -30,12 +30,5 @@
 MIslands::~MIslands()
 {
-  delete fPixNum;
-  delete fSigToNoise;
-  delete fTimeSpread;
-  delete fMeanX;
-  delete fMeanY;
-  delete fDist;
-  delete fDistL;
-  delete fDistW;
+  
 }
 
@@ -59,5 +52,5 @@
 // Print the island parameters to *fLog
 //
-void MIslands::Print(Option_t *opt) const
+void MIslands::Print(Option_t *opt=NULL) const
 {
     *fLog << all;
Index: /trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.h
===================================================================
--- /trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.h	(revision 4554)
+++ /trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.h	(revision 4555)
@@ -29,5 +29,5 @@
     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,5 +51,5 @@
     //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,5 +70,5 @@
     
     // 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; }
Index: /trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc
===================================================================
--- /trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc	(revision 4554)
+++ /trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc	(revision 4555)
@@ -135,10 +135,10 @@
 {
   // Set the general tasks/containers
-  //MExtractFixedWindow    extractor;
+  MExtractFixedWindow    extractor;
+  extractor.SetRange(hifirst,hilast,lofirst,lolast);
+ 
+  //MExtractSlidingWindow    extractor;
   //extractor.SetRange(hifirst,hilast,lofirst,lolast);
- 
-  MExtractSlidingWindow    extractor;
-  extractor.SetRange(hifirst,hilast,lofirst,lolast);
-  extractor.SetWindowSize(4,4);
+  //extractor.SetWindowSize(4,4);
   
   MGeomCamMagic       geomcam;