Skip to content

Commit 60041bc

Browse files
sashingosashingo
committed
PWGHF fixing naming convention
1 parent 47aeff1 commit 60041bc

File tree

1 file changed

+45
-46
lines changed

1 file changed

+45
-46
lines changed

‎PWGHF/HFL/Tasks/taskElectronWeakBoson.cxx‎

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ using namespace o2::framework::expressions;
3636

3737
struct HfTaskElectronWeakBoson {
3838

39-
using SelectedClusters = o2::soa::Filtered<o2::aod::EMCALClusters>;
39+
using SelectedClusters = o2::aod::EMCALClusters;
4040

4141
// PbPb
42-
using TrackEle = o2::soa::Filtered<o2::soa::Join<o2::aod::Tracks, o2::aod::FullTracks, o2::aod::TracksExtra_001, o2::aod::TracksDCA, o2::aod::TrackSelection, o2::aod::pidTPCFullEl>>;
42+
using TrackEle = o2::soa::Join<o2::aod::Tracks, o2::aod::FullTracks, o2::aod::TracksExtra_001, o2::aod::TracksDCA, o2::aod::TrackSelection, o2::aod::pidTPCFullEl>;
4343

4444
// pp
4545
// using TrackEle = o2::soa::Filtered<o2::soa::Join<o2::aod::Tracks, o2::aod::FullTracks, o2::aod::TracksDCA, o2::aod::TrackSelection, o2::aod::pidTPCEl, o2::aod::pidTOFEl>>;
@@ -52,38 +52,38 @@ struct HfTaskElectronWeakBoson {
5252

5353
Configurable<float> vtxZ{"vtxZ", 10.f, ""};
5454

55-
Configurable<float> etalow_cut{"etalow_cut", -0.6f, "eta lower cut"};
56-
Configurable<float> etaup_cut{"etaup_cut", 0.6f, "eta upper cut"};
57-
Configurable<float> dcaxy_cut{"dcaxy_cut", 2.0f, "dca xy cut"};
58-
Configurable<float> itschi2_cut{"itschi2_cut", 15.0f, "its chi2 cut"};
59-
Configurable<float> mimpT_cut{"mimpT_cut", 3.0f, "minimum pT cut"};
60-
Configurable<float> tpcchi2_cut{"tpcchi2_cut", 4.0f, "tpc chi2 cut"};
61-
Configurable<float> itsNcl_cut{"itsNcl_cut", 2.0f, "its # of cluster cut"};
62-
Configurable<float> tpcNcl_cut{"tpcNcl_cut", 100.0f, "tpc # if cluster cut"};
63-
Configurable<float> tpcNclCr_cut{"tpcNclCr_cut", 100.0f, "tpc # of crossedRows cut"};
64-
Configurable<float> tpcNsiglow_cut{"tpcNsiglow_cut", -1.0, "tpc Nsig lower cut"};
65-
Configurable<float> tpcNsigup_cut{"tpcNsigup_cut", 3.0, "tpc Nsig upper cut"};
66-
67-
Configurable<float> emcacc_phimin{"emcacc_phimin", 1.39, "Maximum M20"};
68-
Configurable<float> emcacc_phimax{"emcacc_phimax", 3.36, "Maximum M20"};
69-
Configurable<int> mClusterDefinition{"mClusterDefinition", 10, "cluster definition to be selected, e.g. 10=kV3Default"};
55+
Configurable<float> etalowCut{"etalowCut", -0.6f, "eta lower cut"};
56+
Configurable<float> etaupCut{"etaupCut", 0.6f, "eta upper cut"};
57+
Configurable<float> dcaxyCut{"dcaxyCut", 2.0f, "dca xy cut"};
58+
Configurable<float> itschi2Cut{"itschi2Cut", 15.0f, "its chi2 cut"};
59+
Configurable<float> mimpTCut{"mimpTCut", 3.0f, "minimum pT cut"};
60+
Configurable<float> tpcchi2Cut{"tpcchi2Cut", 4.0f, "tpc chi2 cut"};
61+
Configurable<float> itsNclCut{"itsNclCut", 2.0f, "its # of cluster cut"};
62+
Configurable<float> tpcNclCut{"tpcNclCut", 100.0f, "tpc # if cluster cut"};
63+
Configurable<float> tpcNclCrCut{"tpcNclCrCut", 100.0f, "tpc # of crossedRows cut"};
64+
Configurable<float> tpcNsiglowCut{"tpcNsiglowCut", -1.0, "tpc Nsig lower cut"};
65+
Configurable<float> tpcNsigupCut{"tpcNsigupCut", 3.0, "tpc Nsig upper cut"};
66+
67+
Configurable<float> emcaccPhimin{"emcaccPhimin", 1.39, "Maximum M20"};
68+
Configurable<float> emcaccPhimax{"emcaccPhimax", 3.36, "Maximum M20"};
69+
Configurable<int> ClusterDefinition{"ClusterDefinition", 10, "cluster definition to be selected, e.g. 10=kV3Default"};
7070
Configurable<float> minTime{"minTime", -25., "Minimum cluster time"};
7171
Configurable<float> maxTime{"maxTime", +20., "Maximum cluster time"};
7272
Configurable<float> minM02{"minM02", 0.1, "Minimum M02"};
7373
Configurable<float> maxM02{"maxM02", 0.9, "Maximum M02"};
7474
Configurable<float> minM20{"minM20", 0.1, "Minimum M20"};
7575
Configurable<float> maxM20{"maxM20", 0.6, "Maximum M20"};
76-
Configurable<float> MatchR_cut{"MatchR_cut", 0.1, "cluster - track matching cut"};
76+
Configurable<float> MatchRCut{"MatchRCut", 0.1, "cluster - track matching cut"};
7777

7878
// Filter
7979
Filter eventFilter = (o2::aod::evsel::sel8 == true);
8080
Filter posZFilter = (nabs(o2::aod::collision::posZ) < vtxZ);
8181

82-
Filter etafilter = (aod::track::eta < etaup_cut) && (aod::track::eta > etalow_cut);
83-
Filter dcaxyfilter = (nabs(aod::track::dcaXY) < dcaxy_cut);
82+
Filter etafilter = (aod::track::eta < etaupCut) && (aod::track::eta > etalowCut);
83+
Filter dcaxyfilter = (nabs(aod::track::dcaXY) < dcaxyCut);
8484
Filter filter_globalTr = requireGlobalTrackInFilter();
8585

86-
Filter clusterDefinitionSelection = (o2::aod::emcalcluster::definition == mClusterDefinition) && (o2::aod::emcalcluster::time >= minTime) && (o2::aod::emcalcluster::time <= maxTime) && (o2::aod::emcalcluster::m02 > minM02) && (o2::aod::emcalcluster::m02 < maxM02);
86+
Filter clusterDefinitionSelection = (o2::aod::emcalcluster::definition == ClusterDefinition) && (o2::aod::emcalcluster::time >= minTime) && (o2::aod::emcalcluster::time <= maxTime) && (o2::aod::emcalcluster::m02 > minM02) && (o2::aod::emcalcluster::m02 < maxM02);
8787

8888
// Data Handling Objects
8989
Preslice<o2::aod::EMCALClusterCells> perCluster = o2::aod::emcalclustercell::emcalclusterId;
@@ -116,11 +116,11 @@ struct HfTaskElectronWeakBoson {
116116
// create registrygrams
117117
registry.add("hZvtx", "Z vertex", kTH1F, {axisZvtx});
118118
registry.add("hEventCounter", "hEventCounter", kTH1F, {axisCounter});
119-
registry.add("hITS_Chi2", "ITS #chi^{2}", kTH1F, {axisChi2});
120-
registry.add("hTPC_Chi2", "TPC #chi^{2}", kTH1F, {axisChi2});
121-
registry.add("hTPC_NCls", "TPC NCls", kTH1F, {axisCluster});
122-
registry.add("hITS_NCls", "ITS NCls", kTH1F, {axisITSNCls});
123-
registry.add("hTPC_NClsCrossedRows", "TPC NClsCrossedRows", kTH1F, {axisCluster});
119+
registry.add("hITSchi2", "ITS #chi^{2}", kTH1F, {axisChi2});
120+
registry.add("hTPCchi2", "TPC #chi^{2}", kTH1F, {axisChi2});
121+
registry.add("hTPCnCls", "TPC NCls", kTH1F, {axisCluster});
122+
registry.add("hITSnCls", "ITS NCls", kTH1F, {axisITSNCls});
123+
registry.add("hTPCnClsCrossedRows", "TPC NClsCrossedRows", kTH1F, {axisCluster});
124124
registry.add("hEta", "track eta", kTH1F, {axisEta});
125125
registry.add("hPt", "track pt", kTH1F, {axisPt});
126126
registry.add("hTPCNsigma", "TPC electron Nsigma", kTH2F, {{axisPt}, {axisNsigma}});
@@ -138,49 +138,48 @@ struct HfTaskElectronWeakBoson {
138138

139139
// void process(soa::Filtered<aod::Collisions>::iterator const& collision, SelectedClusters const& clusters, TrackEle const& tracks, o2::aod::EMCALMatchedTracks const& matchedtracks)
140140
void process(soa::Filtered<aod::Collisions>::iterator const& collision, SelectedClusters const& emcClusters, TrackEle const& tracks, o2::aod::EMCALMatchedTracks const& matchedtracks)
141+
// void process(soa::Filtered<aod::Collisions>::iterator const& collision, TrackEle const& tracks, o2::aod::EMCALMatchedTracks const& matchedtracks)
141142
{
142143
registry.fill(HIST("hEventCounter"), 0.5);
143144

144145
// LOGF(info, "Collision index : %d", collision.index());
145146
// LOGF(info, "Number of tracks: %d", tracks.size());
146147
// LOGF(info, "Number of clusters: %d", clusters.size());
147-
// LOGF(info, "Number of clusters: %d", emcClusters.size());
148148

149149
registry.fill(HIST("hZvtx"), collision.posZ());
150150

151151
for (const auto& track : tracks) {
152152

153153
registry.fill(HIST("hEta"), track.eta());
154-
registry.fill(HIST("hITS_Chi2"), track.itsChi2NCl());
155-
registry.fill(HIST("hTPC_Chi2"), track.tpcChi2NCl());
156-
registry.fill(HIST("hTPC_NCls"), track.tpcNClsFound());
157-
registry.fill(HIST("hITS_NCls"), track.itsNCls());
158-
registry.fill(HIST("hTPC_NClsCrossedRows"), track.tpcNClsCrossedRows());
154+
registry.fill(HIST("hITSchi2"), track.itsChi2NCl());
155+
registry.fill(HIST("hTPCchi2"), track.tpcChi2NCl());
156+
registry.fill(HIST("hTPCnCls"), track.tpcNClsFound());
157+
registry.fill(HIST("hITSnCls"), track.itsNCls());
158+
registry.fill(HIST("hTPCnClsCrossedRows"), track.tpcNClsCrossedRows());
159159

160-
if (std::abs(track.eta()) > etaup_cut)
160+
if (std::abs(track.eta()) > etaupCut)
161161
continue;
162-
if (track.tpcNClsCrossedRows() < tpcNclCr_cut)
162+
if (track.tpcNClsCrossedRows() < tpcNclCrCut)
163163
continue;
164-
if (std::abs(track.dcaXY()) > dcaxy_cut)
164+
if (std::abs(track.dcaXY()) > dcaxyCut)
165165
continue;
166-
if (track.itsChi2NCl() > itschi2_cut)
166+
if (track.itsChi2NCl() > itschi2Cut)
167167
continue;
168-
if (track.tpcChi2NCl() > tpcchi2_cut)
168+
if (track.tpcChi2NCl() > tpcchi2Cut)
169169
continue;
170-
if (track.tpcNClsFound() < tpcNcl_cut)
170+
if (track.tpcNClsFound() < tpcNclCut)
171171
continue;
172-
if (track.itsNCls() < itsNcl_cut)
172+
if (track.itsNCls() < itsNclCut)
173173
continue;
174-
if (track.pt() < mimpT_cut)
174+
if (track.pt() < mimpTCut)
175175
continue;
176176
registry.fill(HIST("hPt"), track.pt());
177177
registry.fill(HIST("hTPCNsigma"), track.p(), track.tpcNSigmaEl());
178178

179179
// track - match
180180

181-
if (!emcClusters.size())
182-
continue;
183-
if (track.phi() < emcacc_phimin || track.phi() > emcacc_phimax)
181+
// continue;
182+
if (track.phi() < emcaccPhimin || track.phi() > emcaccPhimax)
184183
continue;
185184
auto tracksofcluster = matchedtracks.sliceBy(perClusterMatchedTracks, track.globalIndex());
186185

@@ -229,15 +228,15 @@ struct HfTaskElectronWeakBoson {
229228
registry.fill(HIST("hEMCtime"), emc_time);
230229
registry.fill(HIST("hEnergy"), emc_energy);
231230

232-
if (R < MatchR_cut)
231+
if (R < MatchRCut)
233232
continue;
234233

235234
double eop = emc_energy / match.track_as<TrackEle>().p();
236235
// LOG(info) << "E/p" << eop;
237236
registry.fill(HIST("hEopNsigTPC"), match.track_as<TrackEle>().tpcNSigmaEl(), eop);
238237
registry.fill(HIST("hM02"), match.track_as<TrackEle>().tpcNSigmaEl(), emc_m02);
239238
registry.fill(HIST("hM20"), match.track_as<TrackEle>().tpcNSigmaEl(), emc_m20);
240-
if (match.track_as<TrackEle>().tpcNSigmaEl() > tpcNsiglow_cut && match.track_as<TrackEle>().tpcNSigmaEl() < tpcNsigup_cut) {
239+
if (match.track_as<TrackEle>().tpcNSigmaEl() > tpcNsiglowCut && match.track_as<TrackEle>().tpcNSigmaEl() < tpcNsigupCut) {
241240
registry.fill(HIST("hEop"), match.track_as<TrackEle>().pt(), eop);
242241
}
243242
}
@@ -246,7 +245,7 @@ struct HfTaskElectronWeakBoson {
246245
}
247246
}
248247

249-
if (Rmim < MatchR_cut) {
248+
if (Rmim < MatchRCut) {
250249
// LOG(info) << "R mim = " << Rmim;
251250
registry.fill(HIST("hTrMatch_mim"), dPhi_mim, dEta_mim);
252251
}

0 commit comments

Comments
 (0)