Skip to content

Please consider the following formatting changes to #12030 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alibuild wants to merge 1 commit into from
Closed

Please consider the following formatting changes to #12030 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions PWGMM/DataModel/ZDCdmOxygen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,27 @@
#ifndef PWGMM_DATAMODEL_ZDCDMOXYGEN_H_
#define PWGMM_DATAMODEL_ZDCDMOXYGEN_H_

#include "Framework/AnalysisDataModel.h"
#include "Framework/ASoAHelpers.h"
#include "Common/DataModel/Centrality.h"

#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"

namespace o2::aod
{
namespace zdcTableOO // o2-linter: disable=name/namespace
{
DECLARE_SOA_COLUMN(ZnaTdc, znaTDC, float); //! TDC ZNA // o2-linter: disable=name/o2-column

Check failure on line 28 in PWGMM/DataModel/ZDCdmOxygen.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ZnaAmpl, znaAmpl, float); //! amplitude ZNA // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZnaPmc, znaPMC, float); //! ADC PMC ZNA // o2-linter: disable=name/o2-column

Check failure on line 30 in PWGMM/DataModel/ZDCdmOxygen.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ZnaPm1, znaPM1, float); //! ADC PM1 ZNA // o2-linter: disable=name/o2-column

Check failure on line 31 in PWGMM/DataModel/ZDCdmOxygen.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ZnaPm2, znaPM2, float); //! ADC PM2 ZNA // o2-linter: disable=name/o2-column

Check failure on line 32 in PWGMM/DataModel/ZDCdmOxygen.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ZnaPm3, znaPM3, float); //! ADC PM3 ZNA // o2-linter: disable=name/o2-column

Check failure on line 33 in PWGMM/DataModel/ZDCdmOxygen.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ZnaPm4, znaPM4, float); //! ADC PM4 ZNA // o2-linter: disable=name/o2-column

Check failure on line 34 in PWGMM/DataModel/ZDCdmOxygen.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ZncTdc, zncTDC, float); //! TDC ZNC // o2-linter: disable=name/o2-column

Check failure on line 35 in PWGMM/DataModel/ZDCdmOxygen.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ZncAmpl, zncAmpl, float); //! amplitude ZNC // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZncPmc, zncPMC, float); //! ADC PMC ZNC // o2-linter: disable=name/o2-column

Check failure on line 37 in PWGMM/DataModel/ZDCdmOxygen.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ZncPm1, zncPM1, float); //! ADC PM1 ZNC // o2-linter: disable=name/o2-column

Check failure on line 38 in PWGMM/DataModel/ZDCdmOxygen.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ZncPm2, zncPM2, float); //! ADC PM2 ZNC // o2-linter: disable=name/o2-column

Check failure on line 39 in PWGMM/DataModel/ZDCdmOxygen.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ZncPm3, zncPM3, float); //! ADC PM3 ZNC // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZncPm4, zncPM4, float); //! ADC PM4 ZNC // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(ZpaTdc, zpaTDC, float); //! TDC ZPA // o2-linter: disable=name/o2-column
Expand All @@ -56,7 +57,7 @@
DECLARE_SOA_COLUMN(CentralityFt0A, centralityFT0A, float); //! Centrality // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(CentralityFt0M, centralityFT0M, float); //! Centrality // o2-linter: disable=name/o2-column
DECLARE_SOA_COLUMN(SelectionBits, selectionBits, uint8_t); //! Selection Flags // o2-linter: disable=name/o2-column
} // namespace zdctable
} // namespace zdcTableOO

DECLARE_SOA_TABLE(ZdcTable, "AOD", "ZdcTeble",
zdcTableOO::ZnaTdc,
Expand Down
140 changes: 70 additions & 70 deletions PWGMM/TableProducer/QC/zdcTaskOxygen.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@
/// \brief Task for ZDC
/// \author chiara.oppedisano@cern.ch

#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"
#include "PWGMM/DataModel/ZDCdmOxygen.h"

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/CCDB/TriggerAliases.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/Core/TrackSelection.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"

#include "PWGMM/DataModel/ZDCdmOxygen.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "Framework/runDataProcessing.h"

#include "TH1F.h"
#include "TH2F.h"
Expand Down Expand Up @@ -80,7 +80,7 @@ struct ZdcTaskOxygen {
{
registry.add("debunchHist", "ZN sum vs. diff; ZNA-ZNC (ns); ZNA+ZNC (ns)", {HistType::kTH2D, {{nBinsTiming, -20., 20.}, {nBinsTiming, -20., 20.}}});

if(doprocessALICEcoll) {
if (doprocessALICEcoll) {
registry.add("hEventCount", "Number of Event; Cut; #Events Passed Cut", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}});
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_allEvents + 1, "All events");
registry.get<TH1>(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_zvtx + 1, "vtxZ");
Expand Down Expand Up @@ -156,63 +156,63 @@ struct ZdcTaskOxygen {

void processZDCautoTrig(aod::Zdc const& zdc)
{
// auto-triggered events for ZDC

auto tdcZNA = zdc.timeZNA();
auto tdcZNC = zdc.timeZNC();
auto tdcZPA = zdc.timeZPA();
auto tdcZPC = zdc.timeZPC();
auto tdcZEM1 = zdc.timeZEM1();
auto tdcZEM2 = zdc.timeZEM2();
//
double zna = zdc.amplitudeZNA();
double znc = zdc.amplitudeZNC();
double zpa = zdc.amplitudeZPA();
double zpc = zdc.amplitudeZPC();
double zem1 = zdc.amplitudeZEM1();
double zem2 = zdc.amplitudeZEM2();
//
double pmcZNA = zdc.energyCommonZNA();
double pmcZNC = zdc.energyCommonZNC();
double pmqZNC[4] = {
0,
0,
0,
0,
};
double pmqZNA[4] = {
0,
0,
0,
0,
};
const int noofZNsectors = 4;
for (int itow = 0; itow < noofZNsectors; itow++) {
pmqZNA[itow] = (zdc.energySectorZNA())[itow];
pmqZNC[itow] = (zdc.energySectorZNC())[itow];
}
// auto-triggered events for ZDC

auto tdcZNA = zdc.timeZNA();
auto tdcZNC = zdc.timeZNC();
auto tdcZPA = zdc.timeZPA();
auto tdcZPC = zdc.timeZPC();
auto tdcZEM1 = zdc.timeZEM1();
auto tdcZEM2 = zdc.timeZEM2();
//
double zna = zdc.amplitudeZNA();
double znc = zdc.amplitudeZNC();
double zpa = zdc.amplitudeZPA();
double zpc = zdc.amplitudeZPC();
double zem1 = zdc.amplitudeZEM1();
double zem2 = zdc.amplitudeZEM2();
//
double pmcZNA = zdc.energyCommonZNA();
double pmcZNC = zdc.energyCommonZNC();
double pmqZNC[4] = {
0,
0,
0,
0,
};
double pmqZNA[4] = {
0,
0,
0,
0,
};
const int noofZNsectors = 4;
for (int itow = 0; itow < noofZNsectors; itow++) {
pmqZNA[itow] = (zdc.energySectorZNA())[itow];
pmqZNC[itow] = (zdc.energySectorZNC())[itow];
}

bool isZNChit = false, isZNAhit = false;
if (tdcCut) { // a narrow TDC window is set
if ((tdcZNC >= tdcZNmincut) && (tdcZNC <= tdcZNmaxcut)) {
isZNChit = true;
}
if ((tdcZNA >= tdcZNmincut) && (tdcZNA <= tdcZNmaxcut)) {
isZNAhit = true;
}
} else { // if no window on TDC is set
if (pmcZNC > 0.) {
isZNChit = true;
}
if (pmcZNA > 0.) {
isZNAhit = true;
}
bool isZNChit = false, isZNAhit = false;
if (tdcCut) { // a narrow TDC window is set
if ((tdcZNC >= tdcZNmincut) && (tdcZNC <= tdcZNmaxcut)) {
isZNChit = true;
}
if ((tdcZNA >= tdcZNmincut) && (tdcZNA <= tdcZNmaxcut)) {
isZNAhit = true;
}
} else { // if no window on TDC is set
if (pmcZNC > 0.) {
isZNChit = true;
}
if (isZNChit && isZNAhit) {
registry.get<TH1>(HIST("debunchHist"))->Fill(zna-znc, zna+znc);
if (pmcZNA > 0.) {
isZNAhit = true;
}
}
if (isZNChit && isZNAhit) {
registry.get<TH1>(HIST("debunchHist"))->Fill(zna - znc, zna + znc);
}

zdcTableoo(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],
zdcTableoo(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],
tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3],
tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2,
-1, -1, -1,
Expand Down Expand Up @@ -253,7 +253,7 @@ struct ZdcTaskOxygen {
for (auto const& amplitude : foundBC.fv0a().amplitude()) {
multV0A += amplitude;
}
}
}

if (foundBC.has_zdc()) {
const auto& zdc = foundBC.zdc();
Expand Down Expand Up @@ -309,16 +309,16 @@ struct ZdcTaskOxygen {
}
}
if (isZNChit && isZNAhit) {
registry.get<TH1>(HIST("debunchHist"))->Fill(zna-znc, zna+znc);
registry.get<TH1>(HIST("debunchHist"))->Fill(zna - znc, zna + znc);
}

zdcTableoo(tdcZNA, zna, pmcZNA, pmqZNA[0], pmqZNA[1], pmqZNA[2], pmqZNA[3],
tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3],
tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2,
multFT0A, multFT0C, multV0A,
zv,
centralityFT0C, centralityFT0A, centralityFT0M,
evSelection);
tdcZNC, znc, pmcZNC, pmqZNC[0], pmqZNC[1], pmqZNC[2], pmqZNC[3],
tdcZPA, zpa, tdcZPC, zpc, tdcZEM1, zem1, tdcZEM2, zem2,
multFT0A, multFT0C, multV0A,
zv,
centralityFT0C, centralityFT0A, centralityFT0M,
evSelection);
}
}
}
Expand Down
Loading