Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 16 additions & 6 deletions PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,12 @@ struct Pi0EtaToGammaGamma {
//---------------------------------------------------------------------------
// Preslices and partitions
o2::framework::SliceCache cache;
o2::framework::PresliceOptional<o2::soa::Filtered<o2::soa::Join<o2::aod::V0PhotonsKF, o2::aod::V0KFEMEventIds, o2::aod::V0PhotonsKFPrefilterBitDerived>>> perCollision_pcm = o2::aod::v0photonkf::emphotoneventId;
o2::framework::PresliceOptional<o2::soa::Join<o2::aod::EmEmcClusters, o2::aod::EMCEMEventIds>> perCollision_emc = o2::aod::emccluster::emphotoneventId;
o2::framework::PresliceOptional<o2::soa::Join<o2::aod::PHOSClusters, o2::aod::PHOSEMEventIds>> perCollision_phos = o2::aod::phoscluster::emphotoneventId;
o2::framework::PresliceOptional<o2::soa::Filtered<o2::soa::Join<o2::aod::EMPrimaryElectronsFromDalitz, o2::aod::EMPrimaryElectronDaEMEventIds, o2::aod::EMPrimaryElectronsPrefilterBitDerived>>> perCollision_electron = o2::aod::emprimaryelectronda::emphotoneventId;
Comment on lines 227 to -232
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrong header, the weights should be used in MC not in data


o2::framework::PresliceOptional<
o2::soa::Filtered<o2::soa::Join<o2::aod::V0PhotonsKF, o2::aod::V0KFEMEventIds, o2::aod::V0PhotonsKFPrefilterBitDerived, o2::aod::V0PhotonOmegaMBWeights>>>
perCollision_pcm = o2::aod::v0photonkf::emeventId;
o2::framework::PresliceOptional<o2::soa::Join<o2::aod::EmEmcClusters, o2::aod::EMCEMEventIds>> perCollision_emc = o2::aod::emccluster::emeventId;
o2::framework::PresliceOptional<o2::soa::Join<o2::aod::PHOSClusters, o2::aod::PHOSEMEventIds>> perCollision_phos = o2::aod::phoscluster::emeventId;
o2::framework::PresliceOptional<o2::soa::Filtered<o2::soa::Join<o2::aod::EMPrimaryElectronsFromDalitz, o2::aod::EMPrimaryElectronEMEventIds, o2::aod::EMPrimaryElectronsPrefilterBitDerived>>> perCollision_electron = o2::aod::emprimaryelectron::emeventId;
Comment on lines -229 to +234
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make sure you are using the new emphotoneventId

o2::framework::PresliceOptional<o2::aod::EmEmcMTracks> perEMCClusterMT = o2::aod::trackmatching::emEmcClusterId;
o2::framework::PresliceOptional<o2::aod::EmEmcMSTracks> perEMCClusterMS = o2::aod::trackmatching::emEmcClusterId;

Expand Down Expand Up @@ -879,7 +880,16 @@ struct Pi0EtaToGammaGamma {
continue;
}

fRegistry.fill(HIST("Pair/same/hs"), v12.M(), v12.Pt(), weight);
float wpair = weight;

if constexpr (requires { g1.omegaMBWeight(); }) {
wpair *= g1.omegaMBWeight();
}
if constexpr (requires { g2.omegaMBWeight(); }) {
wpair *= g2.omegaMBWeight();
}

fRegistry.fill(HIST("Pair/same/hs"), v12.M(), v12.Pt(), wpair);

if (std::find(used_photonIds_per_col.begin(), used_photonIds_per_col.end(), g1.globalIndex()) == used_photonIds_per_col.end()) {
emh1->AddTrackToEventPool(key_df_collision, o2::aod::pwgem::dilepton::utils::EMTrack(g1.pt(), g1.eta(), g1.phi(), 0));
Expand Down
12 changes: 10 additions & 2 deletions PWGEM/PhotonMeson/DataModel/gammaTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -433,9 +433,9 @@ using EMPrimaryElectronDaEMEventId = EMPrimaryElectronDaEMEventIds::iterator;

namespace v0photonsphivpsi
{
DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //!
DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //!
DECLARE_SOA_INDEX_COLUMN(EMPhotonEvent, emphotonevent); //!
DECLARE_SOA_COLUMN(PhiV, phiv, float); //!
DECLARE_SOA_COLUMN(PhiV, phiv, float); //!
DECLARE_SOA_COLUMN(PsiPair, psipair, float);
} // namespace v0photonsphivpsi
DECLARE_SOA_TABLE(V0PhotonsPhiVPsi, "AOD", "V0PHOTONPHIVPSI", //!
Expand Down Expand Up @@ -720,6 +720,14 @@ DECLARE_SOA_TABLE(NonLinV0s, "AOD", "NONLINV0", //! table of non lin corrected v
DECLARE_SOA_TABLE(NonLinEmcClusters, "AOD", "NONLINEMCCLUSTER", //! table of non lin corrected values for EMCal Photons (so far only E and pT)
nonlin::CorrE, nonlin::CorrPt); //!

namespace v0photonMBweights
{
DECLARE_SOA_COLUMN(OmegaMBWeight, omegaMBWeight, float);
}

DECLARE_SOA_TABLE(V0PhotonOmegaMBWeights, "AOD", "V0PHOTONMBW", v0photonMBweights::OmegaMBWeight); // store MB weights. To be joined with V0PhotonsKF table at analysis level.

using V0PhotonOmegaMBWeight = V0PhotonOmegaMBWeights::iterator;
} // namespace o2::aod

#endif // PWGEM_PHOTONMESON_DATAMODEL_GAMMATABLES_H_
4 changes: 4 additions & 0 deletions PWGEM/PhotonMeson/TableProducer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,7 @@ o2physics_add_dpl_workflow(non-lin-producer
SOURCES nonLinProducer.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGEMPhotonMesonCore
COMPONENT_NAME Analysis)
o2physics_add_dpl_workflow(material-budget-weights
SOURCES materialBudgetWeights.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::CCDB ROOT::Hist ROOT::Core
COMPONENT_NAME Analysis)
27 changes: 27 additions & 0 deletions PWGEM/PhotonMeson/TableProducer/materialBudgetWeights.cxx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
// This software is distributed under the terms of the GNU General Public
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
//
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.
///
/// \file MaterialBudgetWeights.h
///
/// \brief This code produces a table to retrieve material budget weights. The table is to be join with V0PhotonKF
///
/// \author Youssef El Mard (youssef.el.mard.bouziani@cern.ch)

#include "PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h"

#include "Framework/runDataProcessing.h"

using namespace o2::framework;

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{adaptAnalysisTask<MaterialBudgetWeights>(cfgc)};
}
4 changes: 3 additions & 1 deletion PWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include "PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h"
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
#include "PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h"
#include "PWGEM/PhotonMeson/Utils/PairUtilities.h"

#include <Framework/AnalysisDataModel.h>
Expand All @@ -26,11 +27,12 @@ using namespace o2::aod;
using namespace o2::framework;
using namespace o2::aod::pwgem::photonmeson::photonpair;

using MyV0Photons = o2::soa::Filtered<o2::soa::Join<o2::aod::V0PhotonsKF, o2::aod::V0KFEMEventIds, o2::aod::V0PhotonsKFPrefilterBitDerived>>;
using MyV0Photons = o2::soa::Filtered<o2::soa::Join<o2::aod::V0PhotonsKF, o2::aod::V0KFEMEventIds, o2::aod::V0PhotonsKFPrefilterBitDerived, o2::aod::V0PhotonOmegaMBWeights>>;
Comment on lines -29 to +30
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrong .cxx, this should be added in MC not in data.
Also it would be good to add this to PCMDalitzee as well in one go.


WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{
adaptAnalysisTask<MaterialBudgetWeights>(cfgc),
adaptAnalysisTask<Pi0EtaToGammaGamma<PairType::kPCMPCM, MyV0Photons, aod::V0Legs>>(cfgc, TaskName{"pi0eta-to-gammagamma-pcmpcm"}),
};
}
96 changes: 96 additions & 0 deletions PWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
// This software is distributed under the terms of the GNU General Public
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
//
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.
///
/// \file materialBudgetWeights.cxx
///
/// \brief This code produces a table to retrieve material budget weights. The table is to be join with V0PhotonKF
///
/// \author Youssef El Mard (youssef.el.mard.bouziani@cern.ch)
///

#ifndef PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_
#define PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_

#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"

#include "Framework/ASoAHelpers.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/AnalysisTask.h"
#include "Framework/Logger.h"
#include <CCDB/BasicCCDBManager.h>
#include <Framework/Configurable.h>
#include <Framework/InitContext.h>

#include <map>
#include <string>

using namespace o2;
using namespace o2::soa;
using namespace o2::framework;

using MyV0PhotonsMB = o2::soa::Join<o2::aod::V0PhotonsKF, o2::aod::V0KFEMEventIds>;
using MyV0PhotonMB = MyV0PhotonsMB::iterator;

struct MaterialBudgetWeights {
Produces<aod::V0PhotonOmegaMBWeights> omegaMBWeight;

Configurable<std::string> ccdbUrl{"ccdbUrl", "http://ccdb-test.cern.ch:8080", "CCDB url"};
Configurable<std::string> mbWeightsPath{"mbWeightsPath", "Users/y/yelmard/MaterialBudget/OmegaMBWeights", "Path of the mb weights"};
Configurable<bool> runWithMBWeights{"runWithMBWeights", false, "Run task using material-budget weights for PCM photons"};
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

runWithMBWeights right now on false just results in an Fata error which is not caught and results in a crash.
I suggest to remove this configurable. Instead see comment below the addition of a dummy process function and process switches.
You can then use

if (doprocessName){
...
}

inside the init function to only load the histogram if the non dummy process function is used.


o2::ccdb::CcdbApi ccdbApi;
TH1F* hOmegaMBFromCCDB = nullptr;

void init(InitContext&)
{
if (!runWithMBWeights) {
LOG(info) << "MaterialBudgetWeights: runWithMBWeights=false -> no CCDB query, will write weight=1";
return;
}

ccdbApi.init(ccdbUrl.value);
std::map<std::string, std::string> metadata;
LOG(info) << "MaterialBudgetWeights: loading Omega MB histogram from CCDB at path: " << mbWeightsPath.value;

hOmegaMBFromCCDB = ccdbApi.retrieveFromTFileAny<TH1F>(mbWeightsPath, metadata, -1);

if (!hOmegaMBFromCCDB) {
LOG(fatal) << "MaterialBudgetWeights: runWithMBWeights=true but CCDB object is missing. Path=" << mbWeightsPath.value;
}
}

float computeMBWeight(float v0Rxy)
{
if (!hOmegaMBFromCCDB) {
LOG(fatal) << "MaterialBudgetWeights: internal error: histogram nullptr while runWithMBWeights=true";
}

int binMBWeight = hOmegaMBFromCCDB->FindBin(v0Rxy);
if (binMBWeight < 1 || binMBWeight > hOmegaMBFromCCDB->GetNbinsX()) {
LOG(debug) << "MaterialBudgetWeights: v0Rxy out of histogram range, returning 1";
return 1.f;
}

return hOmegaMBFromCCDB->GetBinContent(binMBWeight);
}

void process(MyV0PhotonMB const& v0)
{
if (!runWithMBWeights) {
omegaMBWeight(1.f);
return;
}

omegaMBWeight(computeMBWeight(v0.v0radius()));
}
};

Comment on lines +85 to +95
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having a dummyProcess function which fills the weights with 1 is needed, since the weights are now needed for all MC PCM Photon analysis technically.

#endif // PWGEM_PHOTONMESON_UTILS_MATERIALBUDGETWEIGHTS_H_
Loading