Changeset 2452 for trunk/MagicSoft

Timestamp:

11/03/03 12:49:42 (21 years ago)

Author:

blanch

Message:

Bug fixed in MFadc::Pedestal() and in print out.

File:

• trunk/MagicSoft/Simulation/Detector/include-MFadc/MFadc.cxx (modified) (7 diffs)

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

@@ -42 +42 @@
   cout<< "[MFadc]       Response Are : "<<ampl<<" adc counts"<< endl ; 
   cout<< "[MFadc]       Response FWHM : "<<fwhm<<" ns"<< endl ; 
-  cout<< "[MFadc]    - Inner pixels :  "<< endl ; 
+  cout<< "[MFadc]    - Outer pixels :  "<< endl ; 
   cout<< "[MFadc]       Response Are : "<<amplout<<" adc counts"<< endl ; 
   cout<< "[MFadc]       Response FWHM : "<<fwhmout<<" ns"<< endl ; 
@@ -55 +55 @@
 
   sigma = fwhm_resp / 2.35 ; 
-  x0 = 3*sigma ; 
+  x0 = 3*sigma;
   
   Float_t   dX, dX2 ; 
@@ -61 +61 @@
   dX  = WIDTH_FADC_TIMESLICE / SUBBINS ; 
   dX2 = dX/2. ; 
+
+
   
   for (i=0; i< RESPONSE_SLICES_MFADC ; i++ ) {  
@@ -74 +76 @@
 
   } 
+
 
   sigma = fwhm_resp_outer / 2.35 ; 
@@ -380 +383 @@
 
   for(i=0;i<numpix;i++)
-    for(j=0;j<(Int_t)SLICES_MFADC;j++)
-      sig[i][j]+=pedestal[i];
+    for(j=0;j<(Int_t)SLICES_MFADC;j++){
+      if(used[i])
+        sig[i][j]+=pedestal[i];
+      else
+        sig[i][j]=pedestal[i];
+    }
 
 }
@@ -677 +684 @@
     sigma+=((Float_t)value-pedestal[pix])*((Float_t)value-pedestal[pix]);
   }
+
 
   sigma=sqrt(sigma/(SLICES_MFADC-1));
@@ -738 +746 @@
           }
       }
-
     }
   }