Ignore:
Timestamp:
08/10/04 10:02:39 (20 years ago)
Author:
aliu
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars/mtemp/mifae
Files:
5 edited

Legend:

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

    r4554 r4555  
    1919                                                 -*-*- END OF LINE -*-*-
    2020
    21   2004/08/04 Javier Rico
     21  2004/08/10 Ester Aliu
    2222    * library/MIslands.[h,cc], MIslandCalc.[h,cc]
    2323     - remove som bugs
  • trunk/MagicSoft/Mars/mtemp/mifae/library/MIslandCalc.cc

    r4442 r4555  
    160160
    161161  const Int_t nPix=577;
    162   const Int_t nVect=20;
     162  const Int_t nVect=50;
    163163  Int_t numisl;
    164164
     
    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++;
     
    318318      timeVariance[i-1] = MAX-MIN;
    319319     
     320      //noise = 0, in the case of MC w/o noise
     321      if (noise == 0) noise = 1;
     322
    320323      fSigToNoise[i-1]= (Float_t)signal/(Float_t)sqrt(noise);
    321324     
     
    406409  fIsl->SetReadyToSave();
    407410
    408     
    409   for(Int_t i=0;i<nVect;i++)
    410     delete [] vect[i];
    411 
    412   delete vect;
     411 
     412  for (Int_t i = 0; i< nVect; i++)
     413    delete [] vect[i]; 
     414
     415 delete vect;
    413416
    414417  return kTRUE; 
     
    443446    zeros[n] = 0;
    444447 
    445 
     448  //cout << "new event" <<endl;
    446449  MCerPhotPix *pix;
    447450
     
    458461      if( fEvt->IsPixelUsed(idx))
    459462        {
     463          //cout << idx <<endl;
    460464          sflag = 0;
    461465         
     
    480484            {
    481485              nvect++;
     486              // cout << "nvect " << nvect << endl;
    482487              vect[nvect][idx] = 1;         
    483488            }
  • trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.cc

    r4528 r4555  
    3030MIslands::~MIslands()
    3131{
    32   delete fPixNum;
    33   delete fSigToNoise;
    34   delete fTimeSpread;
    35   delete fMeanX;
    36   delete fMeanY;
    37   delete fDist;
    38   delete fDistL;
    39   delete fDistW;
     32 
    4033}
    4134
     
    5952// Print the island parameters to *fLog
    6053//
    61 void MIslands::Print(Option_t *opt) const
     54void MIslands::Print(Option_t *opt=NULL) const
    6255{
    6356    *fLog << all;
  • trunk/MagicSoft/Mars/mtemp/mifae/library/MIslands.h

    r4442 r4555  
    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; }
  • trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

    r4533 r4555  
    135135{
    136136  // Set the general tasks/containers
    137   //MExtractFixedWindow    extractor;
     137  MExtractFixedWindow    extractor;
     138  extractor.SetRange(hifirst,hilast,lofirst,lolast);
     139 
     140  //MExtractSlidingWindow    extractor;
    138141  //extractor.SetRange(hifirst,hilast,lofirst,lolast);
    139  
    140   MExtractSlidingWindow    extractor;
    141   extractor.SetRange(hifirst,hilast,lofirst,lolast);
    142   extractor.SetWindowSize(4,4);
     142  //extractor.SetWindowSize(4,4);
    143143 
    144144  MGeomCamMagic       geomcam;
Note: See TracChangeset for help on using the changeset viewer.