/[PAMELA software]/tof/flight/ToFNuclei/src/ToFNuclei.cpp
ViewVC logotype

Diff of /tof/flight/ToFNuclei/src/ToFNuclei.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.3 by pamelats, Thu Apr 2 11:59:16 2009 UTC revision 1.4 by pamelats, Thu Apr 16 13:43:40 2009 UTC
# Line 4  Line 4 
4  // by "Set_Beta" (ToFNuclei.h), the code is used as before.  // by "Set_Beta" (ToFNuclei.h), the code is used as before.
5  // If beta_in was set by the user using "Set_Beta", this beta  // If beta_in was set by the user using "Set_Beta", this beta
6  // is taken for the calculations.  // is taken for the calculations.
7    //
8  //26-feb-2009: Inserted S115B calibrations from Lucia  //26-feb-2009: Inserted S115B calibrations from Lucia
9  //  //
10  //02-apr-2009: bug found in some "if" statemnts for the  //02-apr-2009: bug found in some "if" statements for the
11  // "Layercharge" definition, but only important if ADC=4095  // "Layercharge" definition, but only important if ADC=4095
12    //
13    //15-apr-2009: small bug found in the calculation of the PMT
14    // charge, the charge for the PMTs 1,9,28.. was calculated
15    // twice, but the final result was OK
16  //  //
17  //*****************************************************  //*****************************************************
18  #include <ToFNuclei.h>  #include <ToFNuclei.h>
# Line 453  if ((beta_mean > 0.05)  && (beta_mean < Line 458  if ((beta_mean > 0.05)  && (beta_mean <
458    
459           if (adc[pmtadc] < PMTsat[pmtadc]) {           if (adc[pmtadc] < PMTsat[pmtadc]) {
460  //----------------------------------------------------------------------------------------  //----------------------------------------------------------------------------------------
461  if ((pmtadc!=1) && (pmtadc!=9) || (pmtadc!=28) || (pmtadc!=29) || (pmtadc!=34)) {  if ((pmtadc!=1) && (pmtadc!=9) && (pmtadc!=28) && (pmtadc!=29) && (pmtadc!=34)) {
462    
463      for ( Int_t jj=0; jj<9; jj++ ){      for ( Int_t jj=0; jj<9; jj++ ){
464      x1[jj] = A0t[pmtadc][jj]+A1t[pmtadc][jj]*beta_mean+A2t[pmtadc][jj]*beta_mean*beta_mean;      x1[jj] = A0t[pmtadc][jj]+A1t[pmtadc][jj]*beta_mean+A2t[pmtadc][jj]*beta_mean*beta_mean;
# Line 912  if ((beta_mean < 0.05)  || (beta_mean > Line 917  if ((beta_mean < 0.05)  || (beta_mean >
917                                                                                    
918           if (adc[pmtadc] < PMTsat[pmtadc]) {           if (adc[pmtadc] < PMTsat[pmtadc]) {
919    
920  if ((pmtadc!=4) && (pmtadc!=8) || (pmtadc!=28) || (pmtadc!=31) || (pmtadc!=34) || (pmtadc!=39) && (pmtadc!=41) || (pmtadc!=46)) {  if ((pmtadc!=4) && (pmtadc!=8) && (pmtadc!=28) && (pmtadc!=31) && (pmtadc!=34) && (pmtadc!=39) && (pmtadc!=41) && (pmtadc!=46)) {
921    
922      for ( Int_t jj=0; jj<9; jj++ ){      for ( Int_t jj=0; jj<9; jj++ ){
923      x1[jj] = A0t[pmtadc][jj]+A1t[pmtadc][jj]*beta_mean+A2t[pmtadc][jj]*beta_mean*beta_mean;      x1[jj] = A0t[pmtadc][jj]+A1t[pmtadc][jj]*beta_mean+A2t[pmtadc][jj]*beta_mean*beta_mean;
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4
  ViewVC Help
Powered by ViewVC 1.1.23