Skip to content

PWGJE: removing some variables for derived data #7444

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

Merged
nzardosh merged 1 commit into from
Aug 27, 2024
Merged

PWGJE: removing some variables for derived data #7444

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
6 changes: 0 additions & 6 deletions PWGJE/TableProducer/jetderiveddatawriter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "Framework/ASoA.h"
#include "Framework/runDataProcessing.h"

#include "Common/CCDB/EventSelectionParams.h"
#include "PWGJE/Core/JetHFUtilities.h"
#include "PWGJE/Core/JetDQUtilities.h"
#include "PWGJE/DataModel/Jet.h"
Expand Down Expand Up @@ -72,8 +71,6 @@ struct JetDerivedDataWriter {
Configurable<bool> saveLcTable{"saveLcTable", false, "save the Lc table to the output"};
Configurable<bool> saveDielectronTable{"saveDielectronTable", false, "save the Dielectron table to the output"};

Configurable<float> vertexZCutForCounting{"vertexZCutForCounting", 10.0, "choose z-vertex cut for collision counter"};
Configurable<std::string> eventSelectionForCounting{"eventSelectionForCounting", "sel8", "choose event selection for collision counter"};
Configurable<std::string> triggerMasks{"triggerMasks", "", "possible JE Trigger masks: fJetChLowPt,fJetChHighPt,fTrackLowPt,fTrackHighPt,fJetD0ChLowPt,fJetD0ChHighPt,fJetLcChLowPt,fJetLcChHighPt,fEMCALReadout,fJetFullHighPt,fJetFullLowPt,fJetNeutralHighPt,fJetNeutralLowPt,fGammaVeryHighPtEMCAL,fGammaVeryHighPtDCAL,fGammaHighPtEMCAL,fGammaHighPtDCAL,fGammaLowPtEMCAL,fGammaLowPtDCAL,fGammaVeryLowPtEMCAL,fGammaVeryLowPtDCAL"};
} config;

Expand Down Expand Up @@ -163,14 +160,11 @@ struct JetDerivedDataWriter {

TRandom3 randomNumber;

int eventSelection = -1;

std::vector<int> triggerMaskBits;
void init(InitContext&)
{
precisionPositionMask = 0xFFFFFC00; // 13 bits
precisionMomentumMask = 0xFFFFFC00; // 13 bits this is currently keept at 13 bits wihich gives roughly a resolution of 1/8000. This can be increased to 15 bits if really needed
eventSelection = jetderiveddatautilities::initialiseEventSelection(static_cast<std::string>(config.eventSelectionForCounting));
randomNumber.SetSeed(0);
triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(config.triggerMasks);
}
Expand Down
2 changes: 1 addition & 1 deletion PWGJE/TableProducer/luminositycalculator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct LuminosityCalculator {
{

std::vector<std::string> histLabels = {"BC", "BC+TVX", "BC+TVX+NoTFB", "BC+TVX+NoTFB+NoITSROFB", "Coll", "Coll+TVX", "Coll+TVX+VtxZ+Sel8", "Coll+TVX+VtxZ+Sel8Full", "Coll+TVX+VtxZ+Sel8FullPbPb", "Coll+TVX+VtxZ+SelMC", "Coll+TVX+VtxZ+SelMCFull", "Coll+TVX+VtxZ+SelMCFullPbPb", "Coll+TVX+VtxZ+SelUnanchoredMC", "Coll+TVX+VtxZ+SelTVX", "Coll+TVX+VtxZ+Sel7", "Coll+TVX+VtxZ+Sel7KINT7"};
registry.add("counter", "BCs and Collisions", HistType::kTH1I, {{static_cast<int>(histLabels.size()), -0.5, static_cast<double>(histLabels.size()) - 0.5}});
registry.add("counter", "BCs and Collisions", HistType::kTH1D, {{static_cast<int>(histLabels.size()), -0.5, static_cast<double>(histLabels.size()) - 0.5}});
auto counter = registry.get<TH1>(HIST("counter"));
for (std::vector<std::string>::size_type iCounter = 0; iCounter < histLabels.size(); iCounter++) {
counter->GetXaxis()->SetBinLabel(iCounter + 1, histLabels[iCounter].data());
Expand Down
7 changes: 0 additions & 7 deletions PWGJE/Tasks/jetsubstructurehfoutput.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@

#include "Common/Core/TrackSelection.h"
#include "Common/Core/TrackSelectionDefaults.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/CCDB/EventSelectionParams.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "PWGHF/DataModel/CandidateReconstructionTables.h"
Expand Down Expand Up @@ -83,9 +81,6 @@ struct JetSubstructureHFOutputTask {
Configurable<float> trackEtaMin{"trackEtaMin", -0.9, "minimum track pseudorapidity"};
Configurable<float> trackEtaMax{"trackEtaMax", 0.9, "maximum track pseudorapidity"};

Configurable<std::string> eventSelectionForCounting{"eventSelectionForCounting", "sel8", "choose event selection for collision counter"};
Configurable<float> vertexZCutForCounting{"vertexZCutForCounting", 10.0, "choose z-vertex cut for collision counter"};

std::map<int32_t, int32_t> jetMappingData;
std::map<int32_t, int32_t> jetMappingDataSub;
std::map<int32_t, int32_t> jetMappingMCD;
Expand All @@ -108,11 +103,9 @@ struct JetSubstructureHFOutputTask {
PresliceOptional<soa::Join<McCollisionsLc, aod::Hf3PMcRCollIds>> LcMcCollisionsPerMcCollision = aod::jlcindices::mcCollisionId;
PresliceOptional<McCollisionsDielectron> DielectronMcCollisionsPerMcCollision = aod::jdielectronindices::mcCollisionId;

int eventSelection = -1;
void init(InitContext const&)
{
jetRadiiValues = (std::vector<double>)jetRadii;
eventSelection = jetderiveddatautilities::initialiseEventSelection(static_cast<std::string>(eventSelectionForCounting));
}

template <typename T, typename U, typename V, typename M>
Expand Down
5 changes: 0 additions & 5 deletions PWGJE/Tasks/jetsubstructureoutput.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,16 @@ struct JetSubstructureOutputTask {
Configurable<float> trackEtaMin{"trackEtaMin", -0.9, "minimum track pseudorapidity"};
Configurable<float> trackEtaMax{"trackEtaMax", 0.9, "maximum track pseudorapidity"};

Configurable<std::string> eventSelectionForCounting{"eventSelectionForCounting", "sel8", "choose event selection for collision counter"};
Configurable<float> vertexZCutForCounting{"vertexZCutForCounting", 10.0, "choose z-vertex cut for collision counter"};

std::map<int32_t, int32_t> jetMappingData;
std::map<int32_t, int32_t> jetMappingDataSub;
std::map<int32_t, int32_t> jetMappingMCD;
std::map<int32_t, int32_t> jetMappingMCP;

std::vector<double> jetRadiiValues;

int eventSelection = -1;
void init(InitContext const&)
{
jetRadiiValues = (std::vector<double>)jetRadii;
eventSelection = jetderiveddatautilities::initialiseEventSelection(static_cast<std::string>(eventSelectionForCounting));
}

template <typename T, typename U, typename V>
Expand Down