--- PamelaDigitizer/Digitizer.cxx 2008/06/06 17:28:39 1.9 +++ PamelaDigitizer/Digitizer.cxx 2008/06/08 06:33:45 1.10 @@ -84,8 +84,8 @@ *ntf=ntof; Ipltof=(UChar_t*)malloc(ntof *sizeof(UChar_t)); Ipaddle=(UChar_t*)malloc(ntof *sizeof(UChar_t)); - Ipartof=(UShort_t*)malloc(ntof *sizeof(UShort_t)); - // Ipartof=(UChar_t*)malloc(ntof *sizeof(UChar_t)); + // Ipartof=(UShort_t*)malloc(ntof *sizeof(UShort_t)); + Ipartof=(UChar_t*)malloc(ntof *sizeof(UChar_t)); Xintof=(Float_t*)malloc(ntof *sizeof(Float_t)); Yintof=(Float_t*)malloc(ntof *sizeof(Float_t)); Zintof=(Float_t*)malloc(ntof *sizeof(Float_t)); @@ -120,8 +120,8 @@ Timecas=(Float_t*)malloc(ncas *sizeof(Float_t)); Pathcas=(Float_t*)malloc(ncas *sizeof(Float_t)); P0cas=(Float_t*)malloc(ncas *sizeof(Float_t)); - Iparspe=(UShort_t*)malloc(nspe *sizeof(UShort_t)); - //Iparspe=(UChar_t*)malloc(nspe *sizeof(UChar_t)); + // Iparspe=(UShort_t*)malloc(nspe *sizeof(UShort_t)); + Iparspe=(UChar_t*)malloc(nspe *sizeof(UChar_t)); Itrpb=(UChar_t*)malloc(nspe *sizeof(UChar_t)); Itrsl=(UChar_t*)malloc(nspe *sizeof(UChar_t)); Itspa=(UChar_t*)malloc(nspe *sizeof(UChar_t)); @@ -350,6 +350,7 @@ lambda1=(float *)malloc(np *sizeof(float)); lambda2=(float *)malloc(np *sizeof(float)); LoadTOFCalib(np,atte1,atte2,lambda1,lambda2); + TF1 *attenAC = new TF1("fAttAC",".825+.64*atan(9.8/x)",0.,45.); //end tof calib // // loops over the events @@ -363,7 +364,7 @@ // http://www.ts.infn.it/fileadmin/documents/physics/experiments/wizard/cpu/gen_arch/RM_Acquisition.pdf // on pamelatov: /cvs/yoda/techmodel/physics/NeutronDetectorReader.cpp DigitizeTOF(np,atte1,atte2,lambda1,lambda2); - DigitizeAC(); + DigitizeAC(attenAC); DigitizeCALO(); DigitizeTrack(); DigitizeS4();