Skip to content

Commit 86b2512

Browse files
gvolpe79gvolpe79
committed
Minors
1 parent cc54e3a commit 86b2512

File tree

8 files changed

+85
-500
lines changed

8 files changed

+85
-500
lines changed

‎DPG/Tasks/AOTTrack/PID/HMPID/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ o2physics_add_dpl_workflow(pid-hmpid-qa-pp
1414
SOURCES qaHMPID_pp.cxx
1515
PUBLIC_LINK_LIBRARIES O2::HMPIDBase O2Physics::AnalysisCore
1616
COMPONENT_NAME Analysis)
17-
17+
1818
o2physics_add_dpl_workflow(pid-hmpid-qa-pb
1919
SOURCES qaHMPID_pb.cxx
2020
PUBLIC_LINK_LIBRARIES O2::HMPIDBase O2Physics::AnalysisCore

‎DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID.cxx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,33 @@
1010
// or submit itself to any jurisdiction.
1111

1212
// O2 includes
13+
#include "tableHMPID.h"
14+
1315
#include "Common/Core/PID/PIDTOF.h"
1416
#include "Common/Core/trackUtilities.h"
1517
#include "Common/DataModel/EventSelection.h"
1618
#include "Common/DataModel/PIDResponse.h"
1719
#include "Common/DataModel/TrackSelectionTables.h"
1820
#include "Common/TableProducer/PID/pidTOFBase.h"
1921

20-
#include "Framework/ASoA.h"
21-
#include "Framework/ASoAHelpers.h"
22-
#include "Framework/AnalysisDataModel.h"
23-
#include "Framework/AnalysisTask.h"
24-
#include "Framework/HistogramRegistry.h"
25-
#include "Framework/RunningWorkflowInfo.h"
26-
#include "Framework/runDataProcessing.h"
27-
#include "ReconstructionDataFormats/DCA.h"
28-
#include "ReconstructionDataFormats/PID.h"
29-
#include "ReconstructionDataFormats/Track.h"
30-
#include "ReconstructionDataFormats/TrackParametrization.h"
31-
// #include "ReconstructionDataFormats/MatchInfoHMP.h"
32-
33-
#include "tableHMPID.h"
34-
3522
#include "CCDB/BasicCCDBManager.h"
3623
#include "CCDB/CcdbApi.h"
24+
#include <Framework/ASoA.h>
25+
#include <Framework/ASoAHelpers.h>
26+
#include <Framework/AnalysisDataModel.h>
27+
#include <Framework/AnalysisTask.h>
28+
#include <Framework/HistogramRegistry.h>
29+
#include <Framework/RunningWorkflowInfo.h>
30+
#include <Framework/runDataProcessing.h>
31+
#include <ReconstructionDataFormats/DCA.h>
32+
#include <ReconstructionDataFormats/PID.h>
33+
#include <ReconstructionDataFormats/Track.h>
34+
#include <ReconstructionDataFormats/TrackParametrization.h>
3735

3836
#include <TTree.h>
3937

38+
#include <string>
39+
4040
using namespace o2;
4141
using namespace o2::framework;
4242
using namespace o2::framework::expressions;

‎DPG/Tasks/AOTTrack/PID/HMPID/analysisHMPID_pb.cxx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323

2424
#include "CCDB/BasicCCDBManager.h"
2525
#include "CCDB/CcdbApi.h"
26-
#include "Framework/ASoA.h"
27-
#include "Framework/ASoAHelpers.h"
28-
#include "Framework/AnalysisDataModel.h"
29-
#include "Framework/AnalysisTask.h"
30-
#include "Framework/HistogramRegistry.h"
31-
#include "Framework/RunningWorkflowInfo.h"
32-
#include "Framework/runDataProcessing.h"
33-
#include "ReconstructionDataFormats/DCA.h"
34-
#include "ReconstructionDataFormats/PID.h"
35-
#include "ReconstructionDataFormats/Track.h"
36-
#include "ReconstructionDataFormats/TrackParametrization.h"
26+
#include <Framework/ASoA.h>
27+
#include <Framework/ASoAHelpers.h>
28+
#include <Framework/AnalysisDataModel.h>
29+
#include <Framework/AnalysisTask.h>
30+
#include <Framework/HistogramRegistry.h>
31+
#include <Framework/RunningWorkflowInfo.h>
32+
#include <Framework/runDataProcessing.h>
33+
#include <ReconstructionDataFormats/DCA.h>
34+
#include <ReconstructionDataFormats/PID.h>
35+
#include <ReconstructionDataFormats/Track.h>
36+
#include <ReconstructionDataFormats/TrackParametrization.h>
3737

3838
#include <TTree.h>
3939

‎DPG/Tasks/AOTTrack/PID/HMPID/deuteronCS_HMPID.cxx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515

1616
#include "tableHMPID.h"
1717

18-
#include "Framework/AnalysisTask.h"
19-
#include "Framework/runDataProcessing.h"
18+
#include <Framework/AnalysisTask.h>
19+
#include <Framework/runDataProcessing.h>
2020

21-
#include "TString.h"
2221
#include <TMath.h>
23-
24-
#include <iostream>
22+
#include <TString.h>
2523

2624
// distance 2D between MIP and Track extrapolated
2725
float distance2D(float x1, float y1, float x2, float y2)

‎DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx‎

Lines changed: 0 additions & 312 deletions
This file was deleted.

‎DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID_pb.cxx‎

Lines changed: 27 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,27 @@
1919
#include "Common/DataModel/TrackSelectionTables.h"
2020
#include "Common/TableProducer/PID/pidTOFBase.h"
2121

22-
#include "Framework/ASoA.h"
23-
#include "Framework/ASoAHelpers.h"
24-
#include "Framework/AnalysisDataModel.h"
25-
#include "Framework/AnalysisTask.h"
26-
#include "Framework/HistogramRegistry.h"
27-
#include "Framework/RunningWorkflowInfo.h"
28-
#include "Framework/runDataProcessing.h"
29-
#include "ReconstructionDataFormats/DCA.h"
30-
#include "ReconstructionDataFormats/PID.h"
31-
#include "ReconstructionDataFormats/Track.h"
32-
#include "ReconstructionDataFormats/TrackParametrization.h"
33-
34-
#include "TF1.h"
22+
#include <Framework/ASoA.h>
23+
#include <Framework/ASoAHelpers.h>
24+
#include <Framework/AnalysisDataModel.h>
25+
#include <Framework/AnalysisTask.h>
26+
#include <Framework/HistogramRegistry.h>
27+
#include <Framework/RunningWorkflowInfo.h>
28+
#include <Framework/runDataProcessing.h>
29+
#include <ReconstructionDataFormats/DCA.h>
30+
#include <ReconstructionDataFormats/PID.h>
31+
#include <ReconstructionDataFormats/Track.h>
32+
#include <ReconstructionDataFormats/TrackParametrization.h>
33+
34+
#include <TF1.h>
3535
#include <TTree.h>
3636

37-
#include "HMPIDBase/Param.h"
37+
#include <HMPIDBase/Param.h>
3838

3939
using namespace o2;
4040
using namespace o2::framework;
4141
using namespace o2::framework::expressions;
42-
43-
// task per leggere la table creata dal task HMPIDanalysis per performance e stablity --dataset pp SENZA il photscharge as vector
42+
using namespace o2::constants::physics;
4443

4544
// distance 2D between MIP and Track extrapolated
4645
float distance2D(float x1, float y1, float x2, float y2)
@@ -108,8 +107,6 @@ void getProbability(float hmpidSignal, float hmpidMomentum, double* probs)
108107
// Calculates probability to be a pion-kaon-proton with the "amplitude" method
109108
// from the given Cerenkov angle and momentum assuming no initial particle composition (class taken by AliROOT)
110109

111-
Double_t probabilityParticle;
112-
113110
Int_t nSpecies = 3;
114111

115112
if (hmpidSignal <= 0) {
@@ -120,56 +117,10 @@ void getProbability(float hmpidSignal, float hmpidMomentum, double* probs)
120117
}
121118

122119
// assign mass in GeV/c^2
123-
Double_t mass[] = {0.139570, 0.493677, 0.938272};
124-
125-
/*
126-
Double_t chAngle_th = expectedSignal(mass, hmpidMomentum);
127-
128-
//check
129-
if (chAngle_th > 900.)
130-
{
131-
return 0.0; // No light emitted, probability is zero
132-
}
133-
134-
/////////////////////////////////////////////////////////////
135-
136-
Double_t sigma_ring = expectedSigma(hmpidMomentum, particleType);
137-
138-
if(sigma_ring==0)
139-
{
140-
return 0.0; //no ring
141-
}
142-
143-
/////////////////////////////////////////////////////////////
144-
145-
// Check if within the "desert" range
146-
if (TMath::Abs(hmpidSignal - chAngle_th) >= 4 * sigma_ring)
147-
{
148-
return 1.0/((Float_t) nSpecies); // Assume equal probability in "desert" case
149-
}
150-
151-
// Calculate Gaussian height for the selected species
152-
Double_t hSpecies = TMath::Gaus(chAngle_th, hmpidSignal, sigma_ring, kTRUE);
153-
154-
// To normalize the probability, calculate the total height (hTot) across all species
155-
Double_t hTot = 0;
156-
for (int i = 0; i < nSpecies; i++)
157-
{
158-
Double_t chAngle_th_i = expectedSignal(mass_species[i], hmpidMomentum);
159-
Double_t sigma_ring_i = expectedSigma(hmpidMomentum, particles_species[i]);
160-
if (sigma_ring_i > 0 && chAngle_th_i <= 900)
161-
{
162-
hTot += TMath::Gaus(chAngle_th_i, hmpidSignal, sigma_ring_i, kTRUE);
163-
}
164-
165-
166-
}
167-
168-
probabilityParticle = hSpecies / hTot;
169-
170-
// Return the normalized probability for the specific species
171-
return (hTot > 0) ? probabilityParticle : 0.0;
172-
*/
120+
double mProton = o2::constants::physics::MassProton;
121+
double mPion = o2::constants::physics::MassPionCharged;
122+
double mKaon = o2::constants::physics::MassKaonCharged;
123+
Double_t mass[] = {mPion, mKaon, mProton};
173124

174125
Double_t hTot = 0; // Initialize the total height of the amplitude method
175126
Double_t* h = new Double_t[nSpecies]; // number of charged particles to be considered
@@ -425,7 +376,7 @@ struct pidHmpidQaPb {
425376
histos.fill(HIST("Mass2distribution"), mass2);
426377
}
427378

428-
float sin2changle;
379+
float sin2changle = 0.;
429380

430381
if (distance2D(hmpid.xtrack(), hmpid.ytrack(), hmpid.xmip(), hmpid.ymip()) < cut_d_mip_track && hmpid.chargeMIP() > 120.) {
431382

@@ -495,7 +446,7 @@ struct pidHmpidQaPb {
495446
//{ ---
496447
if (distance2D(hmpid.xtrack(), hmpid.ytrack(), hmpid.xmip(), hmpid.ymip()) < cut_d_mip_track && hmpid.chargeMIP() > 120.) {
497448
histos.fill(HIST("hmpidNPhotons0"), hmpid.nphotons());
498-
sin2changle = (float)TMath::Power(TMath::Sin(hmpid.chAngle()), 2);
449+
sin2changle = static_cast<float>(TMath::Power(TMath::Sin(hmpid.chAngle()), 2));
499450
if (hmpid.xmip() <= 100. && hmpid.xmip() >= 40. && hmpid.ymip() <= 100. && hmpid.ymip() >= 40.) {
500451
histos.fill(HIST("nPhotons_vs_sin2Ch0"), sin2changle, hmpid.nphotons());
501452
}
@@ -660,7 +611,7 @@ struct pidHmpidQaPb {
660611

661612
if (distance2D(hmpid.xtrack(), hmpid.ytrack(), hmpid.xmip(), hmpid.ymip()) < cut_d_mip_track && hmpid.chargeMIP() > 120.) {
662613
histos.fill(HIST("hmpidNPhotons1"), hmpid.nphotons());
663-
sin2changle = (float)TMath::Power(TMath::Sin(hmpid.chAngle()), 2);
614+
sin2changle = static_cast<float>(TMath::Power(TMath::Sin(hmpid.chAngle()), 2));
664615
if (hmpid.xmip() <= 100. && hmpid.xmip() >= 40. && hmpid.ymip() <= 100. && hmpid.ymip() >= 40.) {
665616
histos.fill(HIST("nPhotons_vs_sin2Ch1"), sin2changle, hmpid.nphotons());
666617
}
@@ -817,7 +768,7 @@ struct pidHmpidQaPb {
817768

818769
if (distance2D(hmpid.xtrack(), hmpid.ytrack(), hmpid.xmip(), hmpid.ymip()) < cut_d_mip_track && hmpid.chargeMIP() > 120.) {
819770
histos.fill(HIST("hmpidNPhotons2"), hmpid.nphotons());
820-
sin2changle = (float)TMath::Power(TMath::Sin(hmpid.chAngle()), 2);
771+
sin2changle = static_cast<float>(TMath::Power(TMath::Sin(hmpid.chAngle()), 2));
821772
if (hmpid.xmip() <= 100. && hmpid.xmip() >= 40. && hmpid.ymip() <= 100. && hmpid.ymip() >= 40.) {
822773
histos.fill(HIST("nPhotons_vs_sin2Ch2"), sin2changle, hmpid.nphotons());
823774
}
@@ -975,7 +926,7 @@ struct pidHmpidQaPb {
975926

976927
if (distance2D(hmpid.xtrack(), hmpid.ytrack(), hmpid.xmip(), hmpid.ymip()) < cut_d_mip_track && hmpid.chargeMIP() > 120.) {
977928
histos.fill(HIST("hmpidNPhotons3"), hmpid.nphotons());
978-
sin2changle = (float)TMath::Power(TMath::Sin(hmpid.chAngle()), 2);
929+
sin2changle = static_cast<float>(TMath::Power(TMath::Sin(hmpid.chAngle()), 2));
979930
if (hmpid.xmip() <= 100. && hmpid.xmip() >= 40. && hmpid.ymip() <= 100. && hmpid.ymip() >= 40.) {
980931
histos.fill(HIST("nPhotons_vs_sin2Ch3"), sin2changle, hmpid.nphotons());
981932
}
@@ -1133,7 +1084,7 @@ struct pidHmpidQaPb {
11331084

11341085
if (distance2D(hmpid.xtrack(), hmpid.ytrack(), hmpid.xmip(), hmpid.ymip()) < cut_d_mip_track && hmpid.chargeMIP() > 120.) {
11351086
histos.fill(HIST("hmpidNPhotons4"), hmpid.nphotons());
1136-
sin2changle = (float)TMath::Power(TMath::Sin(hmpid.chAngle()), 2);
1087+
sin2changle = static_cast<float>(TMath::Power(TMath::Sin(hmpid.chAngle()), 2));
11371088
if (hmpid.xmip() <= 100. && hmpid.xmip() >= 40. && hmpid.ymip() <= 100. && hmpid.ymip() >= 40.) {
11381089
histos.fill(HIST("nPhotons_vs_sin2Ch4"), sin2changle, hmpid.nphotons());
11391090
}
@@ -1291,7 +1242,7 @@ struct pidHmpidQaPb {
12911242

12921243
if (distance2D(hmpid.xtrack(), hmpid.ytrack(), hmpid.xmip(), hmpid.ymip()) < cut_d_mip_track && hmpid.chargeMIP() > 120.) {
12931244
histos.fill(HIST("hmpidNPhotons5"), hmpid.nphotons());
1294-
sin2changle = (float)TMath::Power(TMath::Sin(hmpid.chAngle()), 2);
1245+
sin2changle = static_cast<float>(TMath::Power(TMath::Sin(hmpid.chAngle()), 2));
12951246
if (hmpid.xmip() <= 100. && hmpid.xmip() >= 40. && hmpid.ymip() <= 100. && hmpid.ymip() >= 40.) {
12961247
histos.fill(HIST("nPhotons_vs_sin2Ch5"), sin2changle, hmpid.nphotons());
12971248
}
@@ -1449,7 +1400,7 @@ struct pidHmpidQaPb {
14491400

14501401
if (distance2D(hmpid.xtrack(), hmpid.ytrack(), hmpid.xmip(), hmpid.ymip()) < cut_d_mip_track && hmpid.chargeMIP() > 120.) {
14511402
histos.fill(HIST("hmpidNPhotons6"), hmpid.nphotons());
1452-
sin2changle = (float)TMath::Power(TMath::Sin(hmpid.chAngle()), 2);
1403+
sin2changle = static_cast<float>(TMath::Power(TMath::Sin(hmpid.chAngle()), 2));
14531404
if (hmpid.xmip() <= 100. && hmpid.xmip() >= 40. && hmpid.ymip() <= 100. && hmpid.ymip() >= 40.) {
14541405
histos.fill(HIST("nPhotons_vs_sin2Ch6"), sin2changle, hmpid.nphotons());
14551406
}

0 commit comments

Comments
 (0)