Changeset 1066 for trunk/MagicSoft

Timestamp:

11/13/01 17:01:06 (23 years ago)

Author:

blanch

Message:

Several changes to speed up the camera program have been done and some
memory leakage due to an undeleted pointer has been solved

File:

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

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

@@ -1 @@
-/////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////
 //
 //  MFadc
@@ -18 +18 @@
 #include "MGFadcSignal.hxx"
 
-MFadc::MFadc() { 
-  //
-  //  default constructor 
-  //  
-  //  The procedure is the following: 
-  //  1. some parameters of the trigger are set to default.   
-  //     this parameters of the trigger may be changed
-  //  3. Then the all signals are set to zero
-  
-  fwhm_resp = MFADC_RESPONSE_FWHM       ; 
-  ampl_resp = MFADC_RESPONSE_AMPLITUDE  ; 
-  
-  //
-  //    set up the response shape
-  // 
-  Int_t  i,j ; 
-  
-  Float_t   sigma ; 
-  Float_t   x, x0 ; 
-
-  sigma = fwhm_resp / 2.35 ; 
-  x0 = 3*sigma ; 
-  
-  Float_t   dX, dX2 ; 
-  
-  dX  = WIDTH_FADC_TIMESLICE / SUBBINS ; 
-  dX2 = dX/2. ; 
-  
-  for (i=0; i< RESPONSE_SLICES_MFADC ; i++ ) {  
-
-    x = i * dX + dX2 ; 
-    
-    //
-    //   the value 0.125 was introduced to normalize the things
-    //
-    sing_resp[i] = 0.125 *  
-      ampl_resp * expf(-0.5 * (x-x0)*(x-x0) / (sigma*sigma) ) ; 
-
-  } 
-
-  //
-  //    init the Random Generator for Electonic Noise
-  //
-
-  GenElec = new TRandom () ; 
-
-  //
-  //  set all the booleans used to FALSE, indicating that the pixel is not 
-  //  used in this event. 
-  //
-  
-  for ( i =0 ; i <CAMERA_PIXELS ; i++ ) { 
-    used [i] = FALSE ; 
-  }
-
-  //
-  //  set all pedestals to 0
-  //
-  
-  for ( i =0 ; i <CAMERA_PIXELS ; i++ ) { 
-    pedestal[i] = 0.0 ; 
-  }
-
-  //
-  //  set tha values of FADC slices that would be read after trigger to zero
-  //
-  
-  for (i=0; i <CAMERA_PIXELS; i++){
-    for (j=0; j<FADC_SLICES;j++){
-       output[i][j]=0;
-    }
-  }
-
-}
-
-MFadc::MFadc(Float_t ampl, Float_t fwhm) { 
+MFadc::MFadc(Float_t ampl, Float_t fwhm) {
   //
   //  Constructor overloaded II 
@@ -108 +33 @@
   //    set up the response shape
   // 
-  Int_t  i,j ; 
+  Int_t  i ;
   
   Float_t   sigma ; 
@@ -139 +64 @@
   GenElec = new TRandom () ; 
 
-  //
-  //  set all the booleans used to FALSE, indicating that the pixel is not 
-  //  used in this event. 
-  //
-  
-  for ( i =0 ; i <CAMERA_PIXELS ; i++ ) { 
-    used [i] = FALSE ; 
-  }
+  Reset();
 
   //
@@ -155 +73 @@
     pedestal[i] = 0.0 ; 
   }
-
-  //
-  //  set tha values of FADC slices that would be read after trigger to zero
-  //
-  
-  for (i=0; i <CAMERA_PIXELS; i++){
-    for (j=0; j<FADC_SLICES;j++){
-       output[i][j]=0;
-    }
-  }
-
 }
   
 void MFadc::Reset() { 
-  //
-  //  set all values of the signals to zero
-  //
-  Int_t  i,j ; 
-  
-  for ( i =0 ; i <CAMERA_PIXELS ; i++ ) {
-    used [i] = FALSE ; 
-  } 
-  //
-  //  set tha values of FADC slices that would be read after trigger to zero
-  //
-  
-  for (i=0; i <CAMERA_PIXELS; i++){
-    for (j=0; j<FADC_SLICES;j++){
-       output[i][j]=0;
-    }
-  }
+    //
+    //  set all values of the signals to zero
+    //  set tha values of FADC slices that would be read after trigger to zero
+    //
+    memset(used, 0, CAMERA_PIXELS*sizeof(Bool_t));
+    memset(output, 0, CAMERA_PIXELS*FADC_SLICES*sizeof(UChar_t));
 }
 
@@ -213 +109 @@
     used [iPix] = TRUE ; 
     
-    for (i=0; i < SLICES_MFADC; i++ ) {
+    for (i=0; i < (Int_t) SLICES_MFADC; i++ ) {
       sig[iPix][i] = 0. ; 
     }
@@ -240 +136 @@
     for ( i = 0 ; i<RESPONSE_SLICES; i++ ) {
       ichanfadc = (Int_t) ((ichan+i)/SUBBINS) ; 
-      if ( (ichanfadc) < SLICES_MFADC ) {  
+      if ( (ichanfadc) < (Int_t)SLICES_MFADC ) {  
         sig[iPix][ichanfadc] += (amplitude * sing_resp[i] )  ; 
       } 
@@ -276 +172 @@
     used [iPix] = TRUE ; 
     
-    for (i=0; i < SLICES_MFADC; i++ ) {
+    for (i=0; i < (Int_t)SLICES_MFADC; i++ ) {
       sig[iPix][i] = 0. ; 
     }
   }
-  for ( i = 0 ; i<SLICES_MFADC; i++ ) {
+  for ( i = 0 ; i<(Int_t)SLICES_MFADC; i++ ) {
     sig[iPix][i] = resp[i] ; 
   }
@@ -310 +206 @@
     used [iPix] = TRUE ; 
     
-    for (i=0; i < SLICES_MFADC; i++ ) {
+    for (i=0; i < (Int_t)SLICES_MFADC; i++ ) {
       sig[iPix][i] = 0. ; 
     }
   }
-  for ( i = 0 ; i<SLICES_MFADC; i++ ) {
+  for ( i = 0 ; i<(Int_t)SLICES_MFADC; i++ ) {
     sig[iPix][i] += resp[i] ; 
   }
@@ -371 +267 @@
 
   for(i=0;i<CAMERA_PIXELS;i++)
-    for(j=0;j<SLICES_MFADC;j++)
+    for(j=0;j<(Int_t)SLICES_MFADC;j++)
       sig[i][j]+=pedestal[i];
 }
@@ -429 +325 @@
     }
   }
+  delete GenOff;
 }
 
@@ -438 +335 @@
   for ( Int_t i = 0 ; i < CAMERA_PIXELS; i++) {
     if ( used [i] == TRUE ) {
-      for ( Int_t is=0 ; is< SLICES_MFADC ; is++ ) {
+      for ( Int_t is=0 ; is< (Int_t)SLICES_MFADC ; is++ ) {
 
         sig[i][is] += GenElec->Gaus(0., 2.) ; 
@@ -458 +355 @@
       printf ("Pid %3d",  ip ) ; 
 
-      for ( Int_t is=0 ; is < SLICES_MFADC; is++ ) {
+      for ( Int_t is=0 ; is < (Int_t)SLICES_MFADC; is++ ) {
 
         if ( sig[ip][is] > 0. ) {
@@ -565 +462 @@
       i=0;
       for ( Int_t is=iFirstSlice ; is < (iFirstSlice+FADC_SLICES) ; is++ ) {
-        if (is< SLICES_MFADC && sig[ip][is]>0.0)
+        if (is< (Int_t)SLICES_MFADC && sig[ip][is]>0.0)
           output[ip][i++]=(UChar_t) sig[ip][is];
         else 
@@ -612 +509 @@
       //
       
-      for (Int_t ibin=1; ibin <=SLICES_MFADC; ibin++) {
+      for (Int_t ibin=1; ibin <=(Int_t)SLICES_MFADC; ibin++) {
         hist->SetBinContent (ibin, sig[i][ibin-1]) ;
       }