|
41 | 41 | #include "CCDB/BasicCCDBManager.h" |
42 | 42 | #include "CCDB/CcdbApi.h" |
43 | 43 | #include "CommonConstants/GeomConstants.h" |
| 44 | +<<<<<<< Updated upstream |
| 45 | +======= |
44 | 46 | #include "CommonConstants/MathConstants.h" |
| 47 | +>>>>>>> Stashed changes |
45 | 48 | #include "CommonConstants/PhysicsConstants.h" |
46 | 49 | #include "CommonUtils/NameConf.h" |
47 | 50 | #include "DataFormatsCalibration/MeanVertexObject.h" |
@@ -932,40 +935,40 @@ struct OnTheFlyRichPid { |
932 | 935 | histos.fill(HIST("hSectorID"), iSecor); |
933 | 936 |
|
934 | 937 | switch (mcParticle.pdgCode()) { |
935 | | - case lpdgArray[0]: // Electron |
936 | | - case -lpdgArray[0]: // Positron |
| 938 | + case lpdgArray[kEl]: // Electron |
| 939 | + case -lpdgArray[kEl]: // Positron |
937 | 940 | histos.fill(HIST("h2dBarrelNsigmaTrueElecVsElecHypothesis"), recoTrack.getP(), nSigmaBarrelRich[0]); |
938 | 941 | histos.fill(HIST("h2dBarrelNsigmaTrueElecVsMuonHypothesis"), recoTrack.getP(), nSigmaBarrelRich[1]); |
939 | 942 | histos.fill(HIST("h2dBarrelNsigmaTrueElecVsPionHypothesis"), recoTrack.getP(), nSigmaBarrelRich[2]); |
940 | 943 | histos.fill(HIST("h2dBarrelNsigmaTrueElecVsKaonHypothesis"), recoTrack.getP(), nSigmaBarrelRich[3]); |
941 | 944 | histos.fill(HIST("h2dBarrelNsigmaTrueElecVsProtHypothesis"), recoTrack.getP(), nSigmaBarrelRich[4]); |
942 | 945 | break; |
943 | | - case lpdgArray[1]: // Muon |
944 | | - case -lpdgArray[1]: // AntiMuon |
| 946 | + case lpdgArray[kMu]: // Muon |
| 947 | + case -lpdgArray[kMu]: // AntiMuon |
945 | 948 | histos.fill(HIST("h2dBarrelNsigmaTrueMuonVsElecHypothesis"), recoTrack.getP(), nSigmaBarrelRich[0]); |
946 | 949 | histos.fill(HIST("h2dBarrelNsigmaTrueMuonVsMuonHypothesis"), recoTrack.getP(), nSigmaBarrelRich[1]); |
947 | 950 | histos.fill(HIST("h2dBarrelNsigmaTrueMuonVsPionHypothesis"), recoTrack.getP(), nSigmaBarrelRich[2]); |
948 | 951 | histos.fill(HIST("h2dBarrelNsigmaTrueMuonVsKaonHypothesis"), recoTrack.getP(), nSigmaBarrelRich[3]); |
949 | 952 | histos.fill(HIST("h2dBarrelNsigmaTrueMuonVsProtHypothesis"), recoTrack.getP(), nSigmaBarrelRich[4]); |
950 | 953 | break; |
951 | | - case lpdgArray[2]: // Pion |
952 | | - case -lpdgArray[2]: // AntiPion |
| 954 | + case lpdgArray[kPi]: // Pion |
| 955 | + case -lpdgArray[kPi]: // AntiPion |
953 | 956 | histos.fill(HIST("h2dBarrelNsigmaTruePionVsElecHypothesis"), recoTrack.getP(), nSigmaBarrelRich[0]); |
954 | 957 | histos.fill(HIST("h2dBarrelNsigmaTruePionVsMuonHypothesis"), recoTrack.getP(), nSigmaBarrelRich[1]); |
955 | 958 | histos.fill(HIST("h2dBarrelNsigmaTruePionVsPionHypothesis"), recoTrack.getP(), nSigmaBarrelRich[2]); |
956 | 959 | histos.fill(HIST("h2dBarrelNsigmaTruePionVsKaonHypothesis"), recoTrack.getP(), nSigmaBarrelRich[3]); |
957 | 960 | histos.fill(HIST("h2dBarrelNsigmaTruePionVsProtHypothesis"), recoTrack.getP(), nSigmaBarrelRich[4]); |
958 | 961 | break; |
959 | | - case lpdgArray[3]: // Kaon |
960 | | - case -lpdgArray[3]: // AntiKaon |
| 962 | + case lpdgArray[kka]: // Kaon |
| 963 | + case -lpdgArray[kka]: // AntiKaon |
961 | 964 | histos.fill(HIST("h2dBarrelNsigmaTrueKaonVsElecHypothesis"), recoTrack.getP(), nSigmaBarrelRich[0]); |
962 | 965 | histos.fill(HIST("h2dBarrelNsigmaTrueKaonVsMuonHypothesis"), recoTrack.getP(), nSigmaBarrelRich[1]); |
963 | 966 | histos.fill(HIST("h2dBarrelNsigmaTrueKaonVsPionHypothesis"), recoTrack.getP(), nSigmaBarrelRich[2]); |
964 | 967 | histos.fill(HIST("h2dBarrelNsigmaTrueKaonVsKaonHypothesis"), recoTrack.getP(), nSigmaBarrelRich[3]); |
965 | 968 | histos.fill(HIST("h2dBarrelNsigmaTrueKaonVsProtHypothesis"), recoTrack.getP(), nSigmaBarrelRich[4]); |
966 | 969 | break; |
967 | | - case lpdgArray[4]: // Proton |
968 | | - case -lpdgArray[4]: // AntiProton |
| 970 | + case lpdgArray[kPr]: // Proton |
| 971 | + case -lpdgArray[kPr]: // AntiProton |
969 | 972 | histos.fill(HIST("h2dBarrelNsigmaTrueProtVsElecHypothesis"), recoTrack.getP(), nSigmaBarrelRich[0]); |
970 | 973 | histos.fill(HIST("h2dBarrelNsigmaTrueProtVsMuonHypothesis"), recoTrack.getP(), nSigmaBarrelRich[1]); |
971 | 974 | histos.fill(HIST("h2dBarrelNsigmaTrueProtVsPionHypothesis"), recoTrack.getP(), nSigmaBarrelRich[2]); |
|
0 commit comments