Skip to content

Commit 83af026

Browse files
njacazionjacazio
committed
Fix camel case rule for naming
1 parent bef86a3 commit 83af026

File tree

4 files changed

+57
-46
lines changed

4 files changed

+57
-46
lines changed

‎PWGLF/DataModel/McCentrality.h‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
12+
///
13+
/// \file McCentrality.h
14+
/// \author Nicolò Jacazio nicolo.jacazio@cern.ch
15+
/// \author Francesca Ercolessi francesca.ercolessi@cern.ch
16+
/// \since 2024-06-05
17+
/// \brief Set of tables for the MC centrality
18+
///
19+
20+
#ifndef PWGLF_DATAMODEL_MCCENTRALITY_H_
21+
#define PWGLF_DATAMODEL_MCCENTRALITY_H_
22+
23+
// O2 includes
24+
#include "Framework/ASoA.h"
25+
#include "Framework/AnalysisDataModel.h"
26+
#include "Common/DataModel/Centrality.h"
27+
#include "Framework/Logger.h"
28+
29+
namespace o2::aod
30+
{
31+
// DECLARE_SOA_TABLE(CentFV0As, "AOD", "CENTFV0A", cent::CentFV0A); //! Run3 FV0A estimated centrality table
32+
// DECLARE_SOA_TABLE(CentFT0Ms, "AOD", "CENTFT0M", cent::CentFT0M); //! Run3 FT0M estimated centrality table
33+
// DECLARE_SOA_TABLE(CentFT0As, "AOD", "CENTFT0A", cent::CentFT0A); //! Run3 FT0A estimated centrality table
34+
// DECLARE_SOA_TABLE(CentFT0Cs, "AOD", "CENTFT0C", cent::CentFT0C); //! Run3 FT0C estimated centrality table
35+
// DECLARE_SOA_TABLE(CentFDDMs, "AOD", "CENTFDDM", cent::CentFDDM); //! Run3 FDDM estimated centrality table
36+
// DECLARE_SOA_TABLE(CentNTPVs, "AOD", "CENTNTPV", cent::CentNTPV); //! Run3 NTPV estimated centrality table
37+
38+
DECLARE_SOA_TABLE(McCentFV0As, "AOD", "MCCENTFV0A", o2::soa::Marker<1>, cent::CentFV0A);
39+
DECLARE_SOA_TABLE(McCentFT0Ms, "AOD", "MCCENTFT0M", o2::soa::Marker<2>, cent::CentFT0M);
40+
DECLARE_SOA_TABLE(McCentFT0As, "AOD", "MCCENTFT0A", o2::soa::Marker<3>, cent::CentFT0A);
41+
DECLARE_SOA_TABLE(McCentFT0Cs, "AOD", "MCCENTFT0C", o2::soa::Marker<4>, cent::CentFT0C);
42+
DECLARE_SOA_TABLE(McCentFDDMs, "AOD", "MCCENTFDDM", o2::soa::Marker<5>, cent::CentFDDM);
43+
DECLARE_SOA_TABLE(McCentNTPVs, "AOD", "MCCENTNTPV", o2::soa::Marker<6>, cent::CentNTPV);
44+
45+
} // namespace o2::aod
46+
47+
#endif // PWGLF_DATAMODEL_MCCENTRALITY_H_

‎PWGLF/DataModel/mcCentrality.h‎

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,4 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
///
13-
/// \file mcCentrality.h
14-
/// \author Nicolò Jacazio nicolo.jacazio@cern.ch
15-
/// \author Francesca Ercolessi francesca.ercolessi@cern.ch
16-
/// \since 2024-06-05
17-
/// \brief Set of tables for the MC centrality
18-
///
19-
20-
#ifndef PWGLF_DATAMODEL_MCCENTRALITY_H_
21-
#define PWGLF_DATAMODEL_MCCENTRALITY_H_
22-
23-
// O2 includes
24-
#include "Framework/ASoA.h"
25-
#include "Framework/AnalysisDataModel.h"
26-
#include "Common/DataModel/Centrality.h"
27-
#include "Framework/Logger.h"
28-
29-
namespace o2::aod
30-
{
31-
// DECLARE_SOA_TABLE(CentFV0As, "AOD", "CENTFV0A", cent::CentFV0A); //! Run3 FV0A estimated centrality table
32-
// DECLARE_SOA_TABLE(CentFT0Ms, "AOD", "CENTFT0M", cent::CentFT0M); //! Run3 FT0M estimated centrality table
33-
// DECLARE_SOA_TABLE(CentFT0As, "AOD", "CENTFT0A", cent::CentFT0A); //! Run3 FT0A estimated centrality table
34-
// DECLARE_SOA_TABLE(CentFT0Cs, "AOD", "CENTFT0C", cent::CentFT0C); //! Run3 FT0C estimated centrality table
35-
// DECLARE_SOA_TABLE(CentFDDMs, "AOD", "CENTFDDM", cent::CentFDDM); //! Run3 FDDM estimated centrality table
36-
// DECLARE_SOA_TABLE(CentNTPVs, "AOD", "CENTNTPV", cent::CentNTPV); //! Run3 NTPV estimated centrality table
37-
38-
DECLARE_SOA_TABLE(McCentFV0As, "AOD", "MCCENTFV0A", o2::soa::Marker<1>, cent::CentFV0A);
39-
DECLARE_SOA_TABLE(McCentFT0Ms, "AOD", "MCCENTFT0M", o2::soa::Marker<2>, cent::CentFT0M);
40-
DECLARE_SOA_TABLE(McCentFT0As, "AOD", "MCCENTFT0A", o2::soa::Marker<3>, cent::CentFT0A);
41-
DECLARE_SOA_TABLE(McCentFT0Cs, "AOD", "MCCENTFT0C", o2::soa::Marker<4>, cent::CentFT0C);
42-
DECLARE_SOA_TABLE(McCentFDDMs, "AOD", "MCCENTFDDM", o2::soa::Marker<5>, cent::CentFDDM);
43-
DECLARE_SOA_TABLE(McCentNTPVs, "AOD", "MCCENTNTPV", o2::soa::Marker<6>, cent::CentNTPV);
44-
45-
} // namespace o2::aod
46-
47-
#endif // PWGLF_DATAMODEL_MCCENTRALITY_H_
12+
#include "McCentrality.h" // Placeholder

‎PWGLF/TableProducer/Common/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ o2physics_add_dpl_workflow(zdcsp
3131
COMPONENT_NAME Analysis)
3232

3333
o2physics_add_dpl_workflow(mc-centrality
34-
SOURCES mcCentrality.cxx
34+
SOURCES McCentrality.cxx
3535
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
3636
COMPONENT_NAME Analysis)
3737

PWGLF/TableProducer/Common/mcCentrality.cxx renamed to PWGLF/TableProducer/Common/McCentrality.cxx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010
// or submit itself to any jurisdiction.
1111

1212
///
13-
/// \file mcCentrality.cxx
13+
/// \file McCentrality.cxx
1414
/// \author Nicolò Jacazio nicolo.jacazio@cern.ch
1515
/// \author Francesca Ercolessi francesca.ercolessi@cern.ch
1616
/// \since 2024-06-05
1717
/// \brief Task to produce the table for the equalized multiplicity into centrality bins
1818
///
1919

20-
// O2 includes
21-
#include "PWGLF/DataModel/mcCentrality.h"
20+
#include "PWGLF/DataModel/McCentrality.h"
2221

2322
#include "TableHelper.h"
2423

@@ -46,7 +45,7 @@ using namespace o2::framework::expressions;
4645
using namespace o2::track;
4746

4847
/// Task to produce the response table
49-
struct mcCentrality {
48+
struct McCentrality {
5049

5150
// Tables to produce
5251
Produces<aod::McCentFV0As> centFV0A;
@@ -58,8 +57,8 @@ struct mcCentrality {
5857

5958
// Input parameters
6059
Service<o2::ccdb::BasicCCDBManager> ccdb;
61-
Configurable<std::string> url{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
62-
Configurable<int64_t> ccdbTimestamp{"ccdb-timestamp", -1, "timestamp of the object used to query in CCDB the detector response. If 0 the object corresponding to the run number is used, if < 0 the latest object is used"};
60+
Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
61+
Configurable<int64_t> ccdbTimestamp{"ccdbTimestamp", -1, "timestamp of the object used to query in CCDB the detector response. If 0 the object corresponding to the run number is used, if < 0 the latest object is used"};
6362
Configurable<std::string> path{"path", "/tmp/InputCalibMC.root", "path to calib file or ccdb path if begins with ccdb://"};
6463
Configurable<bool> selectPrimaries{"selectPrimaries", true, "Select only primary particles"};
6564
Service<o2::framework::O2DatabasePDG> pdgDB;
@@ -81,7 +80,7 @@ struct mcCentrality {
8180
void init(o2::framework::InitContext& /*initContext*/)
8281
{
8382
// Set up the CCDB
84-
ccdb->setURL(url.value);
83+
ccdb->setURL(ccdbUrl.value);
8584
ccdb->setCaching(true);
8685
ccdb->setLocalObjectValidityChecking();
8786
ccdb->setCreatedNotAfter(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count());
@@ -130,7 +129,7 @@ struct mcCentrality {
130129
}
131130
return hist;
132131
};
133-
h1dFT0M = getHist(lOfInput, "h1dFT0M");
132+
h1dFT0M = getHist("h1dFT0M");
134133
if (fillFt0A) {
135134
h1dFT0A = getHist("h1dFT0A");
136135
}
@@ -166,4 +165,4 @@ struct mcCentrality {
166165
}
167166
};
168167

169-
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask<mcCentrality>(cfgc)}; }
168+
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{adaptAnalysisTask<McCentrality>(cfgc)}; }

0 commit comments

Comments
 (0)