X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALRecParam.cxx;h=5a9a0cd25f3e9a4b9295dfb5e23b02765638d015;hb=263d803ff3f5383eea9ca3e91daf6be409d1c374;hp=cbb66e0d48cf56232bf96ca9c1d5c26956d5abfa;hpb=88cf6bfb9d6b2f48e0882e5807fd583dd30d58f9;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALRecParam.cxx b/EMCAL/AliEMCALRecParam.cxx index cbb66e0d48c..5a9a0cd25f3 100644 --- a/EMCAL/AliEMCALRecParam.cxx +++ b/EMCAL/AliEMCALRecParam.cxx @@ -33,30 +33,37 @@ #include "AliEMCALRecParam.h" ClassImp(AliEMCALRecParam) - - TObjArray* AliEMCALRecParam::fgkMaps =0; //ALTRO mappings + +TObjArray* AliEMCALRecParam::fgkMaps =0; //ALTRO mappings AliEMCALRecParam::AliEMCALRecParam() : - AliDetectorRecoParam(), - fClusteringThreshold(0.5), - fW0(4.5), - fMinECut(0.45), - fUnfold(kFALSE), - fLocMaxCut(0.03), //clustering - fTrkCutX(6.0), - fTrkCutY(6.0), - fTrkCutZ(6.0), - fTrkCutR(10.0), - fTrkCutAlphaMin(-50.0), - fTrkCutAlphaMax(50.0), - fTrkCutAngle(10000.0), - fTrkCutNITS(3.0), - fTrkCutNTPC(20.0), //track matching - fHighLowGainFactor(16.0), - fOrderParameter(2), - fTau(2.35), - fNoiseThreshold(3), - fNPedSamples(5) //raw signal +AliDetectorRecoParam(), +fClusteringThreshold(0.1), +fW0(4.5), +fMinECut(0.05), +fUnfold(kFALSE), +fLocMaxCut(0.03), +fTimeCut(1.),// high value, accept all +fTimeMin(-1.),// small value, accept all +fTimeMax(1.),// high value, accept all//clustering +fClusterizerFlag(AliEMCALRecParam::kClusterizerv1), +fNRowDiff(1), +fNColDiff(1), +fMthCutEta(0.025), +fMthCutPhi(0.05), +fStep(20), +fTrkCutPt(0.0), +fTrkCutNITS(1.0), +fTrkCutNTPC(20.0), //track matching +fHighLowGainFactor(16.0), +fOrderParameter(2), +fTau(2.35), +fNoiseThreshold(3), +fNPedSamples(5), +fRemoveBadChannels(kFALSE), +fFittingAlgorithm(0), +fUseFALTRO(kTRUE), +fFitLEDEvents(kFALSE)//raw signal { // default reco values @@ -79,13 +86,13 @@ AliEMCALRecParam::AliEMCALRecParam() : // Pb Pb // as a first step, all array elements are initialized to 0.0 - Int_t i, j; + Int_t i=0, j=0; for (i = 0; i < 6; i++) { for (j = 0; j < 6; j++) { fGamma[i][j] = fPiZero[i][j] = fHadron[i][j] = 0.; fGamma1to10[i][j] = fHadron1to10[i][j]= 0.; } - fGammaEnergyProb[i]=0.; // not yet implemented + fGammaEnergyProb[i] =0.; // not yet implemented fHadronEnergyProb[i]=0.; fPiZeroEnergyProb[i]=0.; // not yet implemented @@ -144,15 +151,12 @@ AliEMCALRecParam::AliEMCALRecParam() : fHadron[1][3] = -2.368500e-03; fHadron[1][4] = 0.; - fHadron[2][0] = 0.; fHadron[2][1] = -2.463152e-02; fHadron[2][2] = 1.349257e-01; fHadron[2][3] = -1.089440e-03; fHadron[2][4] = 0.; - - fHadron[3][0] = 0.; fHadron[3][1] = 5.101560e-01; fHadron[3][2] = 1.458679e-01; @@ -209,59 +213,88 @@ AliEMCALRecParam::AliEMCALRecParam() : fPiZero[5][2] = -6.040360e-02; fPiZero[5][3] = -6.137459e-04; fPiZero[5][4] = 1.847328e-05; - + fHadronEnergyProb[0]= 0.; fHadronEnergyProb[1]= 0.; fHadronEnergyProb[2]= 6.188452e-02; fHadronEnergyProb[3]= 2.030230e+00; fHadronEnergyProb[4]= -6.402242e-02; + //unfolding + fSSPars[0] = 0.9262; + fSSPars[1] = 3.365; + fSSPars[2] = 1.548; + fSSPars[3] = 0.1625; + fSSPars[4] = -0.4195; + fSSPars[5] = 0.; + fSSPars[6] = 0.; + fSSPars[7] = 2.332; + fPar5[0] = 12.31; + fPar5[1] = -0.007381; + fPar5[2] = -0.06936; + fPar6[0] = 0.05452; + fPar6[1] = 0.0001228; + fPar6[2] = 0.001361; } - - //----------------------------------------------------------------------------- AliEMCALRecParam::AliEMCALRecParam(const AliEMCALRecParam& rp) : - AliDetectorRecoParam(), - fClusteringThreshold(rp.fClusteringThreshold), - fW0(rp.fW0), - fMinECut(rp.fMinECut), - fUnfold(rp.fUnfold), - fLocMaxCut(rp.fLocMaxCut), //clustering - fTrkCutX(rp.fTrkCutX), - fTrkCutY(rp.fTrkCutY), - fTrkCutZ(rp.fTrkCutZ), - fTrkCutR(rp.fTrkCutR), - fTrkCutAlphaMin(rp.fTrkCutAlphaMin), - fTrkCutAlphaMax(rp.fTrkCutAlphaMax), - fTrkCutAngle(rp.fTrkCutAngle), - fTrkCutNITS(rp.fTrkCutNITS), - fTrkCutNTPC(rp.fTrkCutNTPC), // track matching - fHighLowGainFactor(rp.fHighLowGainFactor), - fOrderParameter(rp.fOrderParameter), - fTau(rp.fTau), - fNoiseThreshold(rp.fNoiseThreshold), - fNPedSamples(rp.fNPedSamples) //raw signal +AliDetectorRecoParam(), +fClusteringThreshold(rp.fClusteringThreshold), +fW0(rp.fW0), +fMinECut(rp.fMinECut), +fUnfold(rp.fUnfold), +fLocMaxCut(rp.fLocMaxCut), +fTimeCut(rp.fTimeCut), +fTimeMin(rp.fTimeMin), +fTimeMax(rp.fTimeMax),//clustering +fClusterizerFlag(rp.fClusterizerFlag), +fNRowDiff(rp.fNRowDiff), +fNColDiff(rp.fNColDiff), +fMthCutEta(rp.fMthCutEta), +fMthCutPhi(rp.fMthCutPhi), +fStep(rp.fStep), +fTrkCutPt(rp.fTrkCutPt), +fTrkCutNITS(rp.fTrkCutNITS), +fTrkCutNTPC(rp.fTrkCutNTPC), // track matching +fHighLowGainFactor(rp.fHighLowGainFactor), +fOrderParameter(rp.fOrderParameter), +fTau(rp.fTau), +fNoiseThreshold(rp.fNoiseThreshold), +fNPedSamples(rp.fNPedSamples), +fRemoveBadChannels(rp.fRemoveBadChannels), +fFittingAlgorithm(rp.fFittingAlgorithm), +fUseFALTRO(rp.fUseFALTRO), +fFitLEDEvents(rp.fFitLEDEvents) //raw signal { //copy constructor //PID values - Int_t i, j; + Int_t i=0, j=0; for (i = 0; i < 6; i++) { for (j = 0; j < 6; j++) { - fGamma[i][j] = rp.fGamma[i][j]; - fGamma1to10[i][j] = rp.fGamma1to10[i][j]; - fHadron[i][j] = rp.fHadron[i][j]; + fGamma[i][j] = rp.fGamma[i][j]; + fGamma1to10[i][j] = rp.fGamma1to10[i][j]; + fHadron[i][j] = rp.fHadron[i][j]; fHadron1to10[i][j] = rp.fHadron1to10[i][j]; - fPiZero[i][j] = rp.fPiZero[i][j]; + fPiZero[i][j] = rp.fPiZero[i][j]; } - fGammaEnergyProb[i] = rp.fGammaEnergyProb[i]; + fGammaEnergyProb[i] = rp.fGammaEnergyProb[i]; fPiZeroEnergyProb[i] = rp.fPiZeroEnergyProb[i]; fHadronEnergyProb[i] = rp.fHadronEnergyProb[i]; } + //unfolding + for (i = 0; i < 8; i++) { + fSSPars[i] = rp.fSSPars[i]; + } + for (i = 0; i < 3; i++) { + fPar5[i] = rp.fPar5[i]; + fPar6[i] = rp.fPar6[i]; + } + } //----------------------------------------------------------------------------- @@ -271,39 +304,54 @@ AliEMCALRecParam& AliEMCALRecParam::operator = (const AliEMCALRecParam& rp) if(this != &rp) { fClusteringThreshold = rp.fClusteringThreshold; - fW0 = rp.fW0; - fMinECut = rp.fMinECut; - fUnfold = rp.fUnfold; - fLocMaxCut = rp.fLocMaxCut; //clustering - fTrkCutX = rp.fTrkCutX; - fTrkCutY = rp.fTrkCutY; - fTrkCutZ = rp.fTrkCutZ; - fTrkCutR = rp.fTrkCutR; - fTrkCutAlphaMin = rp.fTrkCutAlphaMin; - fTrkCutAlphaMax = rp.fTrkCutAlphaMax; - fTrkCutAngle = rp.fTrkCutAngle; - fTrkCutNITS = rp.fTrkCutNITS; - fTrkCutNTPC = rp.fTrkCutNTPC; //track matching + fW0 = rp.fW0; + fMinECut = rp.fMinECut; + fUnfold = rp.fUnfold; + fLocMaxCut = rp.fLocMaxCut; + fTimeCut = rp.fTimeCut; + fTimeMax = rp.fTimeMax; + fTimeMin = rp.fTimeMin;//clustering + fClusterizerFlag = rp.fClusterizerFlag; + fNRowDiff = rp.fNRowDiff; + fNColDiff = rp.fNColDiff; + fMthCutEta = rp.fMthCutEta; + fMthCutPhi = rp.fMthCutPhi; + fStep = rp.fStep; + fTrkCutPt = rp.fTrkCutPt; + fTrkCutNITS = rp.fTrkCutNITS; + fTrkCutNTPC = rp.fTrkCutNTPC; //track matching fHighLowGainFactor = rp.fHighLowGainFactor; - fOrderParameter = rp.fOrderParameter; - fTau = rp.fTau; - fNoiseThreshold = rp.fNoiseThreshold; - fNPedSamples = rp.fNPedSamples; //raw signal - + fOrderParameter = rp.fOrderParameter; + fTau = rp.fTau; + fNoiseThreshold = rp.fNoiseThreshold; + fNPedSamples = rp.fNPedSamples; + fRemoveBadChannels = rp.fRemoveBadChannels; + fFittingAlgorithm = rp.fFittingAlgorithm; + fUseFALTRO = rp.fUseFALTRO; + fFitLEDEvents = rp.fFitLEDEvents;//raw signal + //PID values - Int_t i, j; + Int_t i=0, j=0; for (i = 0; i < 6; i++) { for (j = 0; j < 6; j++) { - fGamma[i][j] = rp.fGamma[i][j]; - fGamma1to10[i][j] = rp.fGamma1to10[i][j]; - fHadron[i][j] = rp.fHadron[i][j]; - fHadron1to10[i][j] = rp.fHadron1to10[i][j]; - fPiZero[i][j] = rp.fPiZero[i][j]; + fGamma[i][j] = rp.fGamma[i][j]; + fGamma1to10[i][j] = rp.fGamma1to10[i][j]; + fHadron[i][j] = rp.fHadron[i][j]; + fHadron1to10[i][j] = rp.fHadron1to10[i][j]; + fPiZero[i][j] = rp.fPiZero[i][j]; } - fGammaEnergyProb[i] = rp.fGammaEnergyProb[i]; + fGammaEnergyProb[i] = rp.fGammaEnergyProb[i]; fPiZeroEnergyProb[i] = rp.fPiZeroEnergyProb[i]; fHadronEnergyProb[i] = rp.fHadronEnergyProb[i]; } + //unfolding + for (i = 0; i < 8; i++) { + fSSPars[i] = rp.fSSPars[i]; + } + for (i = 0; i < 3; i++) { + fPar5[i] = rp.fPar5[i]; + fPar6[i] = rp.fPar6[i]; + } } @@ -363,11 +411,12 @@ AliEMCALRecParam* AliEMCALRecParam::GetLowFluxParam() params->SetName("Low Flux - p+p"); params->SetTitle("Low Flux - p+p"); params->SetEventSpecie(AliRecoParam::kLowMult); + params->SetExtrapolateStep(1); //PID parameters for pp implemented // as a first step, all array elements are initialized to 0.0 - Int_t i, j; + Int_t i=0, j=0; for (i = 0; i < 6; i++) { for (j = 0; j < 6; j++) { params->SetGamma(i,j,0.); @@ -388,7 +437,7 @@ AliEMCALRecParam* AliEMCALRecParam::GetLowFluxParam() params->SetGamma(0,2,1.555996e-02); params->SetGamma(0,3,2.243525e-04); params->SetGamma(0,4,-2.560087e-06); - + params->SetGamma(1,0,6.500216e+00); params->SetGamma(1,1,-2.564958e-01); params->SetGamma(1,2,1.967894e-01); @@ -400,119 +449,119 @@ AliEMCALRecParam* AliEMCALRecParam::GetLowFluxParam() params->SetGamma(2,2,3.126839e-02); params->SetGamma(2,3,3.387532e-04); params->SetGamma(2,4,-4.089145e-06); - + params->SetGamma(3,0,0.); params->SetGamma(3,1,-2.696008e+00); params->SetGamma(3,2, 6.920305e-01); params->SetGamma(3,3,-2.281122e-03); params->SetGamma(3,4,0.); - + params->SetGamma(4,0,2.281564e-01); params->SetGamma(4,1,-7.575040e-02); params->SetGamma(4,2,3.813423e-01); params->SetGamma(4,3,-1.243854e-04); params->SetGamma(4,4,1.232045e-06); - + params->SetGamma(5,0,-3.290107e-01); params->SetGamma(5,1,3.707545e-02); params->SetGamma(5,2,2.917397e-03); params->SetGamma(5,3,4.695306e-05); params->SetGamma(5,4,-3.572981e-07); - + params->SetHadron(0,0,9.482243e-01); params->SetHadron(0,1,-2.780896e-01); params->SetHadron(0,2, 2.223507e-02); params->SetHadron(0,3,7.294263e-04); params->SetHadron(0,4,-5.665872e-06); - + params->SetHadron(1,0,0.); params->SetHadron(1,1,0.); params->SetHadron(1,2,2.483298e-01); params->SetHadron(1,3,0.); params->SetHadron(1,4,0.); - + params->SetHadron(2,0,-5.601199e+00); params->SetHadron(2,1,2.097382e+00); params->SetHadron(2,2,-2.307965e-01); params->SetHadron(2,3,9.206871e-03); params->SetHadron(2,4,-8.887548e-05); - + params->SetHadron(3,0,6.543101e+00); params->SetHadron(3,1,-2.305203e+00); params->SetHadron(3,2,2.761673e-01); params->SetHadron(3,3,-5.465855e-03); params->SetHadron(3,4,2.784329e-05); - + params->SetHadron(4,0,-2.443530e+01); params->SetHadron(4,1,8.902578e+00); params->SetHadron(4,2,-5.265901e-01); params->SetHadron(4,3,2.549111e-02); params->SetHadron(4,4,-2.196801e-04); - + params->SetHadron(5,0,2.102007e-01); params->SetHadron(5,1,-3.844418e-02); params->SetHadron(5,2,1.234682e-01); params->SetHadron(5,3,-3.866733e-03); params->SetHadron(5,4,3.362719e-05); - + params->SetPiZero(0,0,5.07215e-01); params->SetPiZero(0,1,-5.35274e-01); params->SetPiZero(0,2,8.49925e-02); params->SetPiZero(0,3,-3.68740e-03); params->SetPiZero(0,4,5.48228e-05); - + params->SetPiZero(1,0,4.590137e+02); params->SetPiZero(1,1,-7.079341e+01); params->SetPiZero(1,2,4.990735e+00); params->SetPiZero(1,3,-1.241302e-01); params->SetPiZero(1,4,1.065772e-03); - + params->SetPiZero(2,0,1.376415e+02); params->SetPiZero(2,1,-3.031577e+01); params->SetPiZero(2,2,2.474338e+00); params->SetPiZero(2,3,-6.903410e-02); params->SetPiZero(2,4,6.244089e-04); - + params->SetPiZero(3,0,0.); params->SetPiZero(3,1,1.145983e+00); params->SetPiZero(3,2,-2.476052e-01); params->SetPiZero(3,3,1.367373e-02); params->SetPiZero(3,4,0.); - + params->SetPiZero(4,0,-2.09758e+02); params->SetPiZero(4,1,6.30080e+01); params->SetPiZero(4,2,-4.03890e+00); params->SetPiZero(4,3,1.08854e-01); params->SetPiZero(4,4,-9.36248e-04); - + params->SetPiZero(5,0,-1.671477e+01); params->SetPiZero(5,1,2.995415e+00); params->SetPiZero(5,2,-6.040360e-02); params->SetPiZero(5,3,-6.137459e-04); params->SetPiZero(5,4,1.847328e-05); - - -// params->SetHadronEnergyProb(0,0.); -// params->SetHadronEnergyProb(1,0.); -// params->SetHadronEnergyProb(2,1.); -// params->SetHadronEnergyProb(3,0.); -// params->SetHadronEnergyProb(4,0.); - + + + // params->SetHadronEnergyProb(0,0.); + // params->SetHadronEnergyProb(1,0.); + // params->SetHadronEnergyProb(2,1.); + // params->SetHadronEnergyProb(3,0.); + // params->SetHadronEnergyProb(4,0.); + params->SetHadronEnergyProb(0, 4.767543e-02); params->SetHadronEnergyProb(1,-1.537523e+00); params->SetHadronEnergyProb(2,2.956727e-01); params->SetHadronEnergyProb(3,-3.051022e+01); params->SetHadronEnergyProb(4,-6.036931e-02); - -// Int_t ii= 0; -// Int_t jj= 3; -// AliDebug(1,Form("PID parameters (%d, %d): fGamma=%.3f, fPi=%.3f, fHadron=%.3f", -// ii,jj, params->GetGamma(ii,jj), params->GetPiZero(ii,jj), params->GetHadron(ii,jj))); -// cout << " Low Flux Parameters fGamma [2][2] = " << params->GetGamma(2,2) << endl; -// cout << " Low Flux Parameters fHadron [2][2] = " << params->GetHadron(2,2) << endl; - + + // Int_t ii= 0; + // Int_t jj= 3; + // AliDebug(1,Form("PID parameters (%d, %d): fGamma=%.3f, fPi=%.3f, fHadron=%.3f", + // ii,jj, params->GetGamma(ii,jj), params->GetPiZero(ii,jj), params->GetHadron(ii,jj))); + // cout << " Low Flux Parameters fGamma [2][2] = " << params->GetGamma(2,2) << endl; + // cout << " Low Flux Parameters fHadron [2][2] = " << params->GetHadron(2,2) << endl; + return params; - + } @@ -526,53 +575,79 @@ AliEMCALRecParam* AliEMCALRecParam::GetHighFluxParam() params->SetName("High Flux - Pb+Pb"); params->SetTitle("High Flux - Pb+Pb"); params->SetEventSpecie(AliRecoParam::kHighMult); + params->SetTrkCutPt(0.15);//This value can be higher if necessary return params; } //----------------------------------------------------------------------------- -void AliEMCALRecParam::Print(Option_t *) const +void AliEMCALRecParam::Print(Option_t * opt) const { // Print reconstruction parameters to stdout - AliInfo(Form("Clusterization parameters :\n fClusteringThreshold=%.3f,\n fW0=%.3f,\n fMinECut=%.3f,\n fUnfold=%d,\n fLocMaxCut=%.3f \n", - fClusteringThreshold,fW0,fMinECut,fUnfold,fLocMaxCut)); - - AliInfo(Form("Track-matching cuts :\n x %f, y %f, z %f, R %f \n alphaMin %f, alphaMax %f, Angle %f, NITS %f, NTPC %\n", fTrkCutX, fTrkCutY, fTrkCutZ, fTrkCutR,fTrkCutAlphaMin,fTrkCutAlphaMax, fTrkCutAngle,fTrkCutNITS,fTrkCutNTPC)); - - AliInfo(Form("PID parameters, Gamma :\n")); - for(Int_t i = 0; i < 6; i++){ - for(Int_t j = 0; j < 6; j++){ - printf(" %f, ", fGamma[i][j]); + // if nothing is specified print all, if "reco" just clusterization/track matching + // if "pid", just PID parameters, if "raw", just raw utils parameters. + if(!strcmp("",opt) || !strcmp("reco",opt)){ + AliInfo(Form("Clusterizer selected: %d", fClusterizerFlag)); + AliInfo(Form("Clusterization parameters :\n fClusteringThreshold=%.3f,\n fW0=%.3f,\n fMinECut=%.3f,\n fUnfold=%d,\n fLocMaxCut=%.3f,\n fTimeCut=%2.1f ns\n fTimeMin=%2.1f ns\n fTimeMax=%2.1f ns\n", + fClusteringThreshold,fW0,fMinECut,fUnfold,fLocMaxCut,fTimeCut*1.e9,fTimeMin*1e9,fTimeMax*1e9)); + + AliInfo(Form("Track-matching cuts :\n dEta<%f, dPhi<%f, step=%f[cm], pT>%f, NITS>%f, NTPC>%f\n", + fMthCutEta, fMthCutPhi, fStep, fTrkCutPt, fTrkCutNITS,fTrkCutNTPC)); + + AliInfo(Form("Unfolding parameters, Shower shape function :\n")); + for(Int_t i = 0; i < 8; i++){ + printf(" %f, ", fSSPars[i]); + } + printf("\n Parameter 5 : "); + for(Int_t i = 0; i < 3; i++){ + printf(" %f, ", fPar5[i]); + } + printf("\n Parameter 6 : "); + for(Int_t i = 0; i < 3; i++){ + printf(" %f, ", fPar6[i]); } printf("\n"); } - - AliInfo(Form("PID parameters, Hadron :\n")); - for(Int_t i = 0; i < 6; i++){ - for(Int_t j = 0; j < 6; j++){ - printf(" %f, ", fHadron[i][j]); + if(!strcmp("",opt) || !strcmp("pid",opt)){ + AliInfo(Form("PID parameters, Gamma :\n")); + for(Int_t i = 0; i < 6; i++){ + for(Int_t j = 0; j < 6; j++){ + printf(" %f, ", fGamma[i][j]); + } + printf("\n"); + } + + + AliInfo(Form("PID parameters, Hadron :\n")); + for(Int_t i = 0; i < 6; i++){ + for(Int_t j = 0; j < 6; j++){ + printf(" %f, ", fHadron[i][j]); + } + printf("\n"); } + printf("\n"); - } - - printf("\n"); - - AliInfo(Form("PID parameters, Pi0zero :\n")); - for(Int_t i = 0; i < 6; i++){ - for(Int_t j = 0; j < 6; j++){ - printf(" %f, ", fPiZero[i][j]); + + AliInfo(Form("PID parameters, Pi0zero :\n")); + for(Int_t i = 0; i < 6; i++){ + for(Int_t j = 0; j < 6; j++){ + printf(" %f, ", fPiZero[i][j]); + } + printf("\n"); } + printf("\n"); + } - printf("\n"); - - - AliInfo(Form("Raw signal parameters: \n gain factor=%f, order=%d, tau=%f, noise threshold=%d, nped samples=%d \n", - fHighLowGainFactor,fOrderParameter,fTau,fNoiseThreshold,fNPedSamples)); - + if(!strcmp("",opt) || !strcmp("raw",opt)){ + AliInfo(Form("Raw signal parameters: \n gain factor=%f, order=%d, tau=%f, noise threshold=%d, nped samples=%d \n", + fHighLowGainFactor,fOrderParameter,fTau,fNoiseThreshold,fNPedSamples)); + AliInfo(Form("Raw signal: remove bad channels? %d, \n \t with fitting algorithm %d, \n \t Use FALTRO %d, Fit LED events %d \n", + fRemoveBadChannels, fFittingAlgorithm, fUseFALTRO, fFitLEDEvents)); + } } //-----------------------------------------------------------------------------