diff --git a/PWGMM/DataModel/ZDCdmOxygen.h b/PWGMM/DataModel/ZDCdmOxygen.h index 7ce8f6af4c5..2f4e11c98d6 100644 --- a/PWGMM/DataModel/ZDCdmOxygen.h +++ b/PWGMM/DataModel/ZDCdmOxygen.h @@ -16,10 +16,11 @@ #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 @@ -56,7 +57,7 @@ DECLARE_SOA_COLUMN(CentralityFt0C, centralityFT0C, float); //! Centrality 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, diff --git a/PWGMM/TableProducer/QC/zdcTaskOxygen.cxx b/PWGMM/TableProducer/QC/zdcTaskOxygen.cxx index 4fe3af8a120..8cfeb903add 100644 --- a/PWGMM/TableProducer/QC/zdcTaskOxygen.cxx +++ b/PWGMM/TableProducer/QC/zdcTaskOxygen.cxx @@ -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" @@ -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(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_allEvents + 1, "All events"); registry.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_zvtx + 1, "vtxZ"); @@ -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(HIST("debunchHist"))->Fill(zna-znc, zna+znc); + if (pmcZNA > 0.) { + isZNAhit = true; } + } + if (isZNChit && isZNAhit) { + registry.get(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, @@ -253,7 +253,7 @@ struct ZdcTaskOxygen { for (auto const& amplitude : foundBC.fv0a().amplitude()) { multV0A += amplitude; } - } + } if (foundBC.has_zdc()) { const auto& zdc = foundBC.zdc(); @@ -309,16 +309,16 @@ struct ZdcTaskOxygen { } } if (isZNChit && isZNAhit) { - registry.get(HIST("debunchHist"))->Fill(zna-znc, zna+znc); + registry.get(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); } } }