--- calo/flight/CaloNuclei/src/CaloNuclei.cpp 2008/11/07 09:06:15 1.14 +++ calo/flight/CaloNuclei/src/CaloNuclei.cpp 2009/12/14 14:42:53 1.19 @@ -28,6 +28,7 @@ debug = false; // debug = true; usetrack = true; + usepl18x = false; // }; @@ -146,6 +147,9 @@ // mip = L2->GetCaloLevel1()->DecodeEstrip(i,view,plane,strip); // + if ( !usepl18x && view==0 && plane==18 ) mip = 0.; + // + // // put in vfpl vector the energy release on the first plane // if ( strip != -1 && view == 1 && plane == 0 ) { @@ -214,6 +218,8 @@ // mip = L2->GetCaloLevel1()->DecodeEstrip(i,view,plane,strip); // + if ( !usepl18x && view==0 && plane==18 ) mip = 0.; + // if ( ntr >= 0 ){ // if ( strip != -1 && @@ -283,6 +289,9 @@ // mip = L2->GetCaloLevel1()->DecodeEstrip(ii,view,plane,strip); // + if ( !usepl18x && view==0 && plane==18 ) mip = 0.; + // + // if ( ntr >= 0 ){ if ( strip != -1 && mip > ethr && !wmulthit[view] && !wgap[view] && ( strip == (track->tibar[plane][view]-1) || strip == (track->tibar[plane][view]-2) || strip == (track->tibar[plane][view]) ) @@ -411,6 +420,9 @@ // mip = L2->GetCaloLevel1()->DecodeEstrip(ii,view,plane,strip); // + if ( !usepl18x && view==0 && plane==18 ) mip = 0.; + // + // if ( strip != -1 ){ if ( view == 0 ){ ipl = (1 + plane) * 2; @@ -501,7 +513,7 @@ Int_t uplim2 = interplane-1; // while ( l < uplim && ind < interplane ){ - qm = TMath::KOrdStat(interplane,qme,ind,work); + qm = TMath::KOrdStat((Long64_t)interplane,qme,(Long64_t)ind,work); if ( qm >= qmt ){ if ( l < 3 ){ qpremean += qm; @@ -518,7 +530,7 @@ l = 0; RN = 0; while ( l < uplim && ind < interplane ){ - qm2 = TMath::KOrdStat(interplane,qme2,ind,work); + qm2 = TMath::KOrdStat((Long64_t)interplane,qme2,(Long64_t)ind,work); if ( qm2 >= qmt ){ if ( l < N ){ qpremeanN += qm2; @@ -539,7 +551,7 @@ RN = 0; S2=0; while ( l < uplim2 && ind= qmt ){ if ( l < (interplane - 1 - S2)){ qNmin1_w += qm2; @@ -665,15 +677,15 @@ // //======================================================================= // //=========== charge determination Maximum release vs. beta =============== // //====================== Rome method =========================== -// //======================================================================= - - Float_t D0[7] = {0, 3 , 4 , 5 , 6, 8, 90}; - Float_t E1[7] = {0 ,923.553 , 659.842, 1113.97, 3037.25, 3034.84, 0}; - Float_t E2[7] = {0 ,6.92574 , 5.08865, 5.29349, 6.41442, 5.52969, 0}; - Float_t E3[7] = {0 ,9.7227 , 13.18, 23.5444, 38.2057, 63.6784, 80000}; +// //======================================================================= + + Float_t D0[9] = {0, 1, 2, 3 , 4 , 5 , 6, 8, 90}; + Float_t E1[9] = {0, 500, 500, 923.553 , 659.842, 1113.97, 3037.25, 3034.84, 0}; + Float_t E2[9] = {0, 11.0, 7.5, 6.92574 , 5.08865, 5.29349, 6.41442, 5.52969, 0}; + Float_t E3[9] = {0, 1.2, 4, 9.7227 , 13.18, 23.5444, 38.2057, 63.6784, 80000}; - Float_t xx1[7],yy1[7]; - n1 = 7; + Float_t xx1[9],yy1[9]; + n1 = 9; charge = 1000.; mip=0; @@ -714,12 +726,12 @@ // ======================================================================= // =========== charge determination dedx vs. beta =============== // ====================== Rome method =========================== -// ======================================================================= - - Float_t F0[7] = {0.,3. ,4., 5. , 6., 8, 90}; - Float_t G1[7] = {0 ,642.935 , 848.684, 1346.05, 3238.82, 3468.6, 0}; - Float_t G2[7] = {0 ,6.2038 , 5.51723, 5.65265, 6.54089, 5.72723, 0}; - Float_t G3[7] = {0 ,9.2421 , 13.9858, 25.3912, 39.6332, 64.5674, 80000}; +// ======================================================================= + + Float_t F0[9] = {0., 1., 2., 3. ,4., 5. , 6., 8, 90}; + Float_t G1[9] = {0, 500, 500, 642.935 , 848.684, 1346.05, 3238.82, 3468.6, 0}; + Float_t G2[9] = {0, 11, 7.5, 6.2038 , 5.51723, 5.65265, 6.54089, 5.72723, 0}; + Float_t G3[9] = {0, 1.2, 4, 9.2421 , 13.9858, 25.3912, 39.6332, 64.5674, 80000}; charge = 1000.; @@ -763,20 +775,12 @@ //======================================================================= //=========== charge determination dedx vs. defl =============== //====================== Rome method =========================== -//======================================================================= - - //new - Float_t H0[7] = {0, 3 , 4 , 5 , 6, 8, 90 }; - Float_t I1[7] = {0 , 56.1019, 101.673, 109.225, 150.599, 388.531, 0}; - Float_t I2[7] = {0 , -12.5581, -22.5543, -15.9823, -28.2207, -93.6871, 0}; - Float_t I3[7] = {0 , 11.6218, 19.664, 32.1817, 45.7527, 84.5992, 80000}; - - -// Float_t H0[7] = {0, 3 , 4 , 5 , 6, 8, 90 }; -// Float_t I1[7] = {0 , 56.1019, 101.673, 155, 150.599, 388.531, 0}; -// Float_t I2[7] = {0 , -12.5581, -22.5543, -35.6217, -28.2207, -93.6871, 0}; -// Float_t I3[7] = {0 , 11.6218, 19.664, 34.3311, 45.7527, 84.5992, 8000}; +//======================================================================= + Float_t H0[9] = {0, 1, 2, 3 , 4 , 5 , 6, 8, 90 }; + Float_t I1[9] = {0, 3.5, 40, 56.1019, 101.673, 109.225, 150.599, 388.531, 0}; + Float_t I2[9] = {0, -1, -13.6, -12.5581, -22.5543, -15.9823, -28.2207, -93.6871, 0}; + Float_t I3[9] = {0, 1, 5.3, 11.6218, 19.664, 32.1817, 45.7527, 84.5992, 80000}; charge = 1000.; @@ -822,12 +826,12 @@ //============================================================================================ //=========== charge determination Truncated mean (N-1 planes) vs. defl =================== //================================ Rome method ======================================== -//============================================================================================ - - Float_t L0[7] = {0, 3 , 4 , 5 , 6, 8, 90}; - Float_t M1[7] = {0 , 63.0145, 120.504, 173.663, 245.33, 236.517, 0}; - Float_t M2[7] = {0 , -15.005, -31.0635, -39.4988, -60.5011, -46.3992, 0}; - Float_t M3[7] = {0 , 12.5037, 22.8652, 35.2907, 51.4678, 86.4155, 8000}; +//============================================================================================ + + Float_t L0[9] = {0, 1, 2, 3 , 4 , 5 , 6, 8, 90}; + Float_t M1[9] = {0, 3.5, 27, 63.0145, 120.504, 173.663, 245.33, 236.517, 0}; + Float_t M2[9] = {0, -1, -10.6, -15.005, -31.0635, -39.4988, -60.5011, -46.3992, 0}; + Float_t M3[9] = {0, 1, 7, 12.5037, 22.8652, 35.2907, 51.4678, 86.4155, 80000}; charge = 1000.; mip=0;