Changeset 597 for trunk

Timestamp:

02/07/01 16:50:22 (24 years ago)

Author:

harald

Message:

Adding the first version of an Image Cleaning. Therefore a first version
of Class MCamNeigbor was implemented.

The Image cleaning is done in class MNphotEvent.

Location:

trunk/MagicSoft/Mars

Files:

• macros/readCT1.C (modified) (3 diffs)
• manalysis/AnalysisIncl.h (modified) (1 diff)
• manalysis/MNphotEvent.cc (modified) (8 diffs)
• manalysis/MNphotEvent.h (modified) (6 diffs)
• manalysis/MReadCT1Ascii.cc (modified) (4 diffs)
• manalysis/MReadCT1Ascii.h (modified) (2 diffs)
• mgui/GuiLinkDef.h (modified) (1 diff)
• mgui/MCamDisplay.cc (modified) (1 diff)
• mgui/MCamGeom.h (modified) (1 diff)
• mgui/MCamNeighbor.cc (added)
• mgui/MCamNeighbor.h (added)
• mgui/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -11 +11 @@
   MNphotEvent *phevt = new MNphotEvent() ; 
 
-
   plist->AddToList( phevt ) ; 
   
-
   //MReadCT1Ascii *readct1 = new MReadCT1Ascii("/hd10/www/Anal_MAGIC/MCCT1_99_ga20.dat") ; 
 
@@ -22 +20 @@
 
   Int_t icount = 0 ; 
-
   MCamDisplay display(0) ; 
 
@@ -31 +28 @@
       cout << "Event: " << icount++  << endl  ;
       
-      if ( icount == 3 ) { 
-        phevt->Print() ;
-      } 
-
+      
+      phevt->Print() ;
+      
       display->Draw( phevt )  ; 
-      // display->DrawError( phevt )  ; 
-
       gClient->HandleInput();   
-      
       if(getchar()=='q')
         break;
+      
+      phevt->CleanLevel1() ; 
+      
+      phevt->CleanLevel2() ; 
+      
+      display->Draw( phevt )  ; 
+      gClient->HandleInput();   
+      if(getchar()=='q')
+        break;
+      
+
     } 
 

trunk/MagicSoft/Mars/manalysis/AnalysisIncl.h

@@ -5 +5 @@
 
 #include "MParContainer.h"
+#include "MCamNeighbor.h"
 
 #endif // __CINT__

trunk/MagicSoft/Mars/manalysis/MNphotEvent.cc

@@ -6 +6 @@
 
 #include "MCamGeom.h"
+#include "MCamNeighbor.h"
 #include "MCamDisplay.h"
 #include "MHexagon.h"
@@ -16 +17 @@
   //  default constructor
   fPixId    = pix ; 
+  fIsUsed   = kTRUE ; 
   fPhot     = phot ; 
   fErrPhot  = errphot ; 
@@ -23 +25 @@
 {
   fPixId    = pix ; 
+  fIsUsed   = kTRUE ; 
   fPhot     = phot ; 
   fErrPhot  = errphot ; 
@@ -30 +33 @@
 { 
   //   information about a pixel
-  cout << "MNphotPix: Pixel: "<< fPixId 
-       << "  Nphot= " << fPhot
+  cout << "MNphotPix: Pixel: "<< fPixId ; 
+  
+  if ( fIsUsed == kTRUE )
+    cout << "   Used " ; 
+  else 
+    if ( fIsUsed == kFALSE )
+      cout << " UnUsed " ;
+
+  cout << "  Nphot= " << fPhot
        << "  Error(Nphot) = " << fErrPhot
        << endl ; 
@@ -54 +64 @@
   fPixels = new TClonesArray ("MNphotPix", 577) ;
   
+  fNN = new MCamNeighbor() ; 
+
   fPixels->Clear() ; 
 }
@@ -59 +71 @@
 void MNphotEvent::Draw(Option_t* option) 
 {
-  //
+  //   FIXME!!!
   // 
   
@@ -102 +114 @@
     }
 }
-  
+
+void MNphotEvent::CleanLevel1()
+{ 
+  //  This method looks for all pixels with an entry (photons) 
+  //  that is three times bigger than the noise of the pixel
+  
+  Float_t entry, noise ; 
+  
+  // first look for pixels above some noise level 
+  
+  for (Int_t il=0; il<fPixels->GetEntries(); il++ ) 
+    {
+      entry = ((MNphotPix *) fPixels->At(il))->GetPhotons() ; 
+      noise =  3 * ((MNphotPix *) fPixels->At(il))->GetErrorPhot() ; 
+      
+      if (entry < 3 * noise ) 
+        ((MNphotPix *) fPixels->At(il))->SetPixelUnused() ; 
+        
+    }
+} 
+
+void MNphotEvent::CleanLevel2()
+{
+  //  check if the  survived pixel have a neighbor, that also 
+  //  survived
+  
+  Int_t id, id2 ; 
+  Int_t itest ;
+ 
+  for (Int_t il=0; il<fPixels->GetEntries(); il++ ) 
+    {
+      if ( ((MNphotPix *) fPixels->At(il))->IsPixelUsed() == kTRUE )
+        { 
+          id = ((MNphotPix *) fPixels->At(il))->GetPixId() ; 
+          
+          itest = 0 ; 
+          for (Int_t in=0 ; in < 6 ; in++ ) { 
+             
+            id2 = fNN->GetNN(id, in ) ; 
+            
+            if ( PixelIsUsed(id2) == kTRUE ) 
+              cout << " hulibu " << id << "/" << id2 << endl ;  
+            
+            
+          } 
+        } 
+    } 
+} 
+
+Bool_t MNphotEvent::PixelExist(Int_t id ) 
+{ 
+  //   Checks if in the pixel list is an entry with pixel id
+  
+  for (Int_t il=0; il<fPixels->GetEntries(); il++ ) 
+    {
+      if ( id == ((MNphotPix *) fPixels->At(il))->GetPixId() ) { 
+        
+        cout << " PixelExist " << il ; 
+        return kTRUE ; 
+      } 
+    } 
+
+  return kFALSE ; 
+
+} 
+
+Bool_t MNphotEvent::PixelIsUsed(Int_t id ) 
+{ 
+  //   Checks if in the pixel list is an entry with pixel id
+  
+  for (Int_t il=0; il<fPixels->GetEntries(); il++ ) 
+    {
+      if ( id == ((MNphotPix *) fPixels->At(il))->GetPixId() && 
+           ((MNphotPix *) fPixels->At(il))->IsPixelUsed() == kTRUE ) { 
+        
+        cout << " PixelIsUsed  " << il ; 
+        return kTRUE ; 
+      } 
+    } 
+
+  return kFALSE ; 
+
+} 
+
 Int_t MNphotEvent::GetPixelId(Int_t i ) 
 { 
@@ -108 +203 @@
 } 
 
+Bool_t  MNphotEvent::IsPixelUsed(Int_t i ) 
+{
+  return ( ( (MNphotPix *) fPixels->At(i))->IsPixelUsed() ) ;
+}
+ 
 Float_t MNphotEvent::GetPhotons(Int_t i ) 
 { 

trunk/MagicSoft/Mars/manalysis/MNphotEvent.h

@@ -10 +10 @@
 class TClonesArray ; 
 class TObjArray ; 
+class MCamNeighbor ; 
 
 class MNphotPix : public TObject
@@ -16 +17 @@
   
   Int_t    fPixId     ;  //   the pixel Id
+  Bool_t   fIsUsed    ;  //   the pixel is used for calculations --> kTRUE
   Float_t  fPhot      ;  //   The number of Cerenkov photons 
   Float_t  fErrPhot   ;  //   the error of fPhot
-
+ 
  public:
   
@@ -42 +44 @@
   void SetPixelContent(Int_t pix , Float_t phot , Float_t errphot ) ; 
 
+  Bool_t IsPixelUsed() 
+    { 
+      return fIsUsed ; 
+    }  
+  
+  void SetPixelUnused() 
+    { 
+      fIsUsed = kFALSE ; 
+    }  
+  
+  void SetPixelUsed() 
+    { 
+      fIsUsed = kTRUE ; 
+    }  
+  
+  
+  
   ClassDef(MNphotPix, 1)  // Cerenkov Photons class for the pixel
 } ; 
@@ -57 +76 @@
   Int_t            fNbPixels ;   // 
   TClonesArray     *fPixels   ;  //
+
+
+  MCamNeighbor     *fNN  ;   //!   the class with the information about neighbors
   
  public:
@@ -72 +94 @@
   void Print() ; 
 
+  void CleanLevel1() ; 
+  void CleanLevel2() ; 
+  
+  Bool_t PixelExist( Int_t id ) ; 
+  Bool_t PixelIsUsed( Int_t id ) ; 
+ 
   Int_t GetPixelId(Int_t i ) ; 
+  Bool_t  IsPixelUsed(Int_t i ) ;
   Float_t GetPhotons(Int_t i ) ; 
   Float_t GetErrorPhot(Int_t i ) ; 
@@ -80 +109 @@
  
   ClassDef(MNphotEvent, 1)    // class for Nphotons Events
-};
+}; 
 
 #endif

trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.cc

@@ -27 +27 @@
 
     fFileName = fname;
+
+    // set the pedestals to default values 
+    
+    for (Int_t i = 0; i<127; i++ )
+      {
+        
+        fPedest[i] = 1.5  ; 
+      } 
+    
 }
 
@@ -67 +76 @@
     return kFALSE ; 
 
+  // if the first number is negativ this is the pedestal line
+  
+  if (dummyI < 0 )
+    ReadPedestal() ; 
+
   fscanf ( fInputfile, "%d", &dummyI ) ; 
   fscanf ( fInputfile, "%d", &dummyI ) ; 
@@ -78 +92 @@
       fscanf ( fInputfile, "%f", &dummyF ) ;
       
-      
       if ( dummyF > 0.0 ) { 
-        fNphot->AddPixel(i, dummyF, sqrt(dummyF) ) ; 
+        fNphot->AddPixel(i, dummyF, fPedest[i] ) ; 
       } 
       
@@ -94 +107 @@
 }
 
+
+void MReadCT1Ascii::ReadPedestal() 
+{ 
+  cout << " Read in the Pedestals " << endl ; 
+  Int_t   dummyI ; 
+  Float_t dummyF ; 
+  
+  // the next for values are for dummy 
+  fscanf ( fInputfile, "%d", &dummyI ) ; 
+  fscanf ( fInputfile, "%d", &dummyI ) ; 
+  fscanf ( fInputfile, "%d", &dummyI ) ; 
+  fscanf ( fInputfile, "%d", &dummyI ) ; 
+
+  //    read in the next 127 numbers as the pedestals
+
+  for (Int_t i = 0; i<127; i++ )
+    {
+      fscanf ( fInputfile, "%f", &dummyF ) ;
+      
+      if ( dummyF > 0.0 ) { 
+        fPedest[i] = dummyF ; 
+      } 
+      
+    }
+
+  fscanf ( fInputfile, "%d", &dummyI ) ; 
+
+
+} 
+

trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.h

@@ -17 +17 @@
   MNphotEvent *fNphot ; //! the data container for all data. 
 
+  Float_t fPedest[127] ; //!
+
  public:
   MReadCT1Ascii(const char *filename, 
@@ -26 +28 @@
   Bool_t PostProcess();
   
+  void   ReadPedestal() ; 
+
   ClassDef(MReadCT1Ascii, 1)    // Reads the CT1 data file
 };
-    
+
 #endif
+

trunk/MagicSoft/Mars/mgui/GuiLinkDef.h

@@ -15 +15 @@
 #pragma link C++ class MPixGeom; 
 #pragma link C++ class MCamGeom;
+#pragma link C++ class MCamNeighbor;
 
 #pragma link C++ class MCamDisplay;

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -144 +144 @@
       UpdateLegend() ; 
     }  
-  
-
- 
-  cout << fMinPhe << "/" << fMaxPhe << endl ; 
+
+  //   update the picture 
 
   for (Int_t i=0 ; i<event->GetNbPixels() ; i++ )
     {
-      ( (MHexagon*) fPixels->At( event->GetPixelId(i) ))->SetFillColor( GetColor(event->GetPhotons(i))) ; 
-    } 
-  
+      if ( event->IsPixelUsed(i) == TRUE ) 
+        ( (MHexagon*) fPixels->At( event->GetPixelId(i) ))->SetFillColor( GetColor(event->GetPhotons(i))) ; 
+   
+    } 
+ 
   Draw() ; 
   

trunk/MagicSoft/Mars/mgui/MCamGeom.h

@@ -82 +82 @@
   void Print() ; 
 
-  
-
   ClassDef(MCamGeom, 1)         // Base (abstract) class for a task
 };

trunk/MagicSoft/Mars/mgui/Makefile

@@ -59 +59 @@
            MHexagon.cc \
            MCamGeom.cc \
+           MCamNeighbor.cc \
            MCamDisplay.cc