Changeset 5082 for trunk/MagicSoft/Simulation/Detector/include-MTrigger

Timestamp:

09/16/04 17:20:13 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Simulation/Detector/include-MTrigger

Files:

• MTrigger.cxx (modified) (4 diffs)
• MTrigger.hxx (modified) (2 diffs)

trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx

@@ -365 +365 @@
 
 MTrigger::MTrigger(Int_t pix, MGeomCam *camgeom,
-                   float gate, float overt, float ampl, float fwhm) { 
+                   float gate, float overt, float ampl, float fwhm, int ct_id) { 
   // ============================================================
   //
@@ -487 +487 @@
   // 
 
-  histPmt = new TH1F ("histPmt","Noise of PMT", 40, 0., 40.) ;
+  char histname[32];
+  sprintf(histname, "histPmt_%d", ct_id);
+  histPmt = new TH1F (histname,"Noise of PMT", 40, 0., 40.) ;
   
   Stat_t ValRazmik[41] = { 0., 2.14, 2.06, 2.05, 2.05, 2.06, 2.07, 2.08,  2.15,
@@ -925 +927 @@
   else if ( iPix >= pixnum ) {
     //
-    //  We have not to fill information in the trigger part, 
-    //  but we must create the height of the puls going into 
+    //  We do not have to fill information in the trigger part, 
+    //  but we must create the height of the pulse going into 
     //  the FADC simulation
     //
     PmtAmp =  (histPmt->GetRandom()/histMean) ; 
-    
-    //
-    //  But we fill the information in the counters of phe's
-    //
-    
-    if ( fall == CASE_SHOW )
-      nphotshow[iPix]++ ; 
-    else if ( fall == CASE_NSB ) 
-      nphotshow[iPix]++ ; 
-    else if ( fall == CASE_STAR ) 
-      nphotstar[iPix]++ ; 
-    
-      
+
+    // AM April 2004: removed updating of counters nphotshow, nphotnsb,
+    // nphotstar for outer pixels... these arrays (see constructors) are
+    // initialized only with as many elements as trigger pixels!! This
+    // made the camera crash at random in some ocassions.
   }
   else {  
@@ -995 +989 @@
       nphotshow[iPix]++ ; 
     else if ( fall == CASE_NSB ) 
-      nphotshow[iPix]++ ; 
+      nphotnsb[iPix]++ ; 
     else if ( fall == CASE_STAR ) 
       nphotstar[iPix]++ ; 

trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.hxx

@@ -115 +115 @@
 
   TH1F     *histPmt ; 
-  Float_t  histMean ;    // Mean value of the distribution of Rasmik (stored in histPmt) 
+  Float_t  histMean ;    // Mean value of the distribution of Razmik (stored in histPmt) 
   TRandom  *GenElec  ;   // RandomGenerator for the Electronic Noise
 
@@ -174 +174 @@
 
   MTrigger(int pix, MGeomCam *camgeom,
-           float gate, float overt, float ampl, float fwhm) ; 
+           float gate, float overt, float ampl, float fwhm, int ct_id=0) ; 
   
   MTrigger(int pix,