Skip to content

Please consider the following formatting changes to #13664 #13

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 #13664 #13

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
21 changes: 9 additions & 12 deletions Common/Core/FFitWeights.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
#include <TCollection.h>
#include <TH1.h>
#include <TH2.h>
#include <TProfile.h>
#include <TNamed.h>
#include <TObjArray.h>
#include <TProfile.h>
#include <TSpline.h>
#include <TString.h>

Expand Down Expand Up @@ -77,8 +77,8 @@ void FFitWeights::init()

if (!ptAxis)
this->setPtAxis(3000, -3, 3);
//fW_data->Add(new TH2D("hPtWeight", "", centBin, 0, centBin, ptBin, ptAxis->GetXmin(), ptAxis->GetXmax()));
fW_data->Add(new TProfile("pMeanPt","", centBin, 0, centBin));
// fW_data->Add(new TH2D("hPtWeight", "", centBin, 0, centBin, ptBin, ptAxis->GetXmin(), ptAxis->GetXmax()));
fW_data->Add(new TProfile("pMeanPt", "", centBin, 0, centBin));
fW_data->Add(new TH2D("hPtWeight", "", centBin, 0, centBin, ptBin, ptAxis->GetXmin(), ptAxis->GetXmax()));
};

Expand Down Expand Up @@ -110,8 +110,7 @@ void FFitWeights::fillPt(float centrality, float pt, bool first)
tp = reinterpret_cast<TProfile*>(tar->At(tar->GetEntries() - 1));
}
tp->Fill(centrality, pt);
}
else {
} else {
auto th2 = reinterpret_cast<TH2D*>(tar->FindObject("hPtWeight"));
if (!th2) {
tar->Add(new TH2D("hPtWeight", "", centBin, 0, centBin, ptBin, ptAxis->GetXmin(), ptAxis->GetXmax()));
Expand Down Expand Up @@ -142,9 +141,9 @@ Long64_t FFitWeights::Merge(TCollection* collist)
fW_data->SetName("FFitWeights_Data");
fW_data->SetOwner(kTRUE);
}
FFitWeights* lW= 0;
FFitWeights* lW = 0;
TIter allW(collist);
while ((lW= (reinterpret_cast<FFitWeights*>(allW())))) {
while ((lW = (reinterpret_cast<FFitWeights*>(allW())))) {
addArray(fW_data, lW->getDataArray());
nmerged++;
}
Expand All @@ -154,7 +153,7 @@ void FFitWeights::addArray(TObjArray* targ, TObjArray* sour)
{
if (!sour) {
// printf("Source array does not exist!\n");
//LOGF(info, "FFitWeights source array does not exist!");
// LOGF(info, "FFitWeights source array does not exist!");
return;
}
for (int i = 0; i < sour->GetEntries(); i++) {
Expand Down Expand Up @@ -195,7 +194,6 @@ void FFitWeights::mptSel()
tmpgr->SetName(Form("sp_mpt_%i", iSP));
fW_data->Add(tmpgr);
}

}

void FFitWeights::qSelection(const std::vector<int>& nhv, const std::vector<std::string>& stv) /* only execute OFFLINE */
Expand All @@ -210,8 +208,8 @@ void FFitWeights::qSelection(const std::vector<int>& nhv, const std::vector<std:
for (const auto& nh : nhv) {
TH2D* th2{reinterpret_cast<TH2D*>(tar->FindObject(this->getQName(nh, pf.c_str())))};
if (!th2) {
//printf("qh not found!\n");
//LOGF(info, "FFitWeights qh not found!");
// printf("qh not found!\n");
// LOGF(info, "FFitWeights qh not found!");
return;
}

Expand Down Expand Up @@ -287,4 +285,3 @@ float FFitWeights::evalPt(float centr, const float& mpt)
}
return ptVal;
};

1 change: 0 additions & 1 deletion Common/Core/FFitWeights.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ class FFitWeights : public TNamed

void mptSel();


private:
TObjArray* fW_data;

Expand Down
4 changes: 2 additions & 2 deletions Common/DataModel/EseTable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// or submit itself to any jurisdiction.

/// \file EseTable.h
/// \brief ESE Framework (20/08/2024)
/// \brief ESE Framework (20/08/2024)
/// \author Joachim C. K. B. Hansen, Lund University, joachim.hansen@cern.ch

//
Expand Down Expand Up @@ -51,7 +51,7 @@ namespace meanptshape
{
DECLARE_SOA_COLUMN(FMEANPT, fMEANPT, std::vector<float>);
DECLARE_SOA_COLUMN(FMEANPTSHAPE, fMEANPTSHAPE, std::vector<float>);
}
} // namespace meanptshape
DECLARE_SOA_TABLE(MeanPts, "AOD", "MEANPT", meanptshape::FMEANPT);
DECLARE_SOA_TABLE(MeanPtShapes, "AOD", "MEANPTSHAPE", meanptshape::FMEANPTSHAPE);
using MeanPt = MeanPts::iterator;
Expand Down
78 changes: 34 additions & 44 deletions Common/TableProducer/eseTableProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@

#include "FFitWeights.h"

#include "Common/Core/TrackSelection.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EseTable.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/Qvectors.h"

#include "Common/Core/TrackSelection.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include <CCDB/BasicCCDBManager.h>
Expand Down Expand Up @@ -64,7 +63,6 @@ struct EseTableProducer {
Produces<o2::aod::MeanPt> meanPts;
Produces<o2::aod::MeanPtShapes> meanPtShapes;


OutputObj<FFitWeights> weightsFFit{FFitWeights("weights")};
HistogramRegistry registry{"registry", {}, OutputObjHandlingPolicy::AnalysisObject, false, false};

Expand All @@ -86,7 +84,6 @@ struct EseTableProducer {
static constexpr int Step1{1};
static constexpr int Step2{2};


enum class DetID { FT0C,
FT0A,
FT0M,
Expand All @@ -108,7 +105,6 @@ struct EseTableProducer {

Service<o2::ccdb::BasicCCDBManager> ccdb;


Configurable<float> cfgVtxZ{"cfgVtxZ", 10.0f, "max z vertex position"};
Configurable<float> cfgEta{"cfgEta", 0.8f, "max eta"};
Configurable<float> cfgPtmin{"cfgPtmin", 0.2f, "min pt"};
Expand All @@ -119,11 +115,10 @@ struct EseTableProducer {

o2::framework::expressions::Filter collisionFilter = nabs(aod::collision::posZ) < cfgVtxZ;
o2::framework::expressions::Filter trackFilter = nabs(aod::track::eta) < cfgEta && aod::track::pt > cfgPtmin&& aod::track::pt < cfgPtmax && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == static_cast<uint8_t>(true))) && (aod::track::itsChi2NCl < cfgChi2PrITSCls) && (aod::track::tpcChi2NCl < cfgChi2PrTPCCls) && nabs(aod::track::dcaZ) < cfgDCAz;

Preslice<aod::Tracks> perCollision = aod::track::collisionId;
using GFWTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA>>;


void init(o2::framework::InitContext&)
{

Expand Down Expand Up @@ -260,17 +255,16 @@ struct EseTableProducer {
}
};


template <typename TTracks, typename Cent>
double calculateMeanPt(TTracks const& tracks, Cent const& centrality)
{
std::vector<double> meanPtEvent;
for (const auto& track : tracks)
{
for (const auto& track : tracks) {
meanPtEvent.push_back(track.pt());
weightsFFit->fillPt(centrality, track.pt(), true);
}
if (meanPtEvent.empty()) return 0.0;
if (meanPtEvent.empty())
return 0.0;
auto mean = std::accumulate(meanPtEvent.begin(), meanPtEvent.end(), 0.0) / meanPtEvent.size();
return mean;
}
Expand Down Expand Up @@ -306,44 +300,40 @@ struct EseTableProducer {
}
PROCESS_SWITCH(EseTableProducer, processESE, "process q vectors to calculate reduced q-vector", true);

void processMeanPt(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0CVariant1s, aod::CentFT0Ms, aod::CentNTPVs, aod::CentNGlobals, aod::CentMFTs>>::iterator const& collision, aod::BCsWithTimestamps const&, GFWTracks const& tracks) {

std::vector<float> meanPt{ -1 };
std::vector<float> meanPtShape{ -1 };

registry.fill(HIST("hMeanPtStat"), 0.5);
const auto centrality = collision.centFT0C();
const auto mean = calculateMeanPt(tracks, centrality);

if (cfgMeanPt == 0) {
registry.fill(HIST("hMeanPtStat"), 1.5);
}
else {
const auto avgpt = eventShape->getPtMult(centrality);
if (mean == 0.0) {
registry.fill(HIST("hMeanPtStat"), cfgMeanPt == Step1 ? 2.5 : 3.5);
}
else {
const auto binval = (mean - avgpt) / avgpt;
weightsFFit->fillPt(centrality, binval, false);
meanPt[0] = binval;
void processMeanPt(soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0CVariant1s, aod::CentFT0Ms, aod::CentNTPVs, aod::CentNGlobals, aod::CentMFTs>>::iterator const& collision, aod::BCsWithTimestamps const&, GFWTracks const& tracks)
{

if (cfgMeanPt == Step1) {
registry.fill(HIST("hMeanPtStat"), 2.5);
}
else if (cfgMeanPt == Step2) {
registry.fill(HIST("hMeanPtStat"), 3.5);
const auto value = eventShape->evalPt(centrality, binval);
meanPtShape[0] = value;
std::vector<float> meanPt{-1};
std::vector<float> meanPtShape{-1};

registry.fill(HIST("hMeanPtStat"), 0.5);
const auto centrality = collision.centFT0C();
const auto mean = calculateMeanPt(tracks, centrality);

if (cfgMeanPt == 0) {
registry.fill(HIST("hMeanPtStat"), 1.5);
} else {
const auto avgpt = eventShape->getPtMult(centrality);
if (mean == 0.0) {
registry.fill(HIST("hMeanPtStat"), cfgMeanPt == Step1 ? 2.5 : 3.5);
} else {
const auto binval = (mean - avgpt) / avgpt;
weightsFFit->fillPt(centrality, binval, false);
meanPt[0] = binval;

if (cfgMeanPt == Step1) {
registry.fill(HIST("hMeanPtStat"), 2.5);
} else if (cfgMeanPt == Step2) {
registry.fill(HIST("hMeanPtStat"), 3.5);
const auto value = eventShape->evalPt(centrality, binval);
meanPtShape[0] = value;
}
}
}
}

meanPts(meanPt);
meanPtShapes(meanPtShape);

meanPts(meanPt);
meanPtShapes(meanPtShape);
}
PROCESS_SWITCH(EseTableProducer, processMeanPt, "process mean pt selection", false);

};
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask<EseTableProducer>(cfgc)}; }
Loading