Skip to content

[PWGCF] DptDpt - First step in implementing linter recommendations #11252

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
victor-gonzalez merged 1 commit into from
May 19, 2025
Merged

[PWGCF] DptDpt - First step in implementing linter recommendations #11252

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
4 changes: 2 additions & 2 deletions PWGCF/TableProducer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGCF/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Use kebab-case for names of workflows and match the name of the workflow file.
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
# All rights not expressly granted are reserved.
#
Expand All @@ -14,12 +14,12 @@
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(filter-correlations-2prong

Check failure on line 17 in PWGCF/TableProducer/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name filter-correlations-2prong does not match its file name filter2Prong.cxx. (Matches filterCorrelations2Prong.cxx.)
SOURCES filter2Prong.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(dptdpt-filter
SOURCES dptdptfilter.cxx
o2physics_add_dpl_workflow(dpt-dpt-filter
SOURCES dptDptFilter.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
COMPONENT_NAME Analysis)
4 changes: 2 additions & 2 deletions PWGCF/TableProducer/dptdptfilter.cxx → PWGCF/TableProducer/dptDptFilter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

/// \file dptdptfilter.cxx
/// \file dptDptFilter.cxx
/// \brief Filters collisions and tracks according to selection criteria
/// \author victor.gonzalez.sebastian@gmail.com

Expand Down Expand Up @@ -46,7 +46,7 @@
#include <TH3.h>
#include <TProfile3D.h>

#include "PWGCF/TableProducer/dptdptfilter.h"
#include "PWGCF/TableProducer/dptDptFilter.h"

using namespace o2;
using namespace o2::framework;
Expand Down Expand Up @@ -277,7 +277,7 @@
case kProton:
/* not clear if we should use IsPhysicalPrimary here */
/* TODO: adapt to FT0M Run 3 and other estimators */
if (0.001 < p.pt() && p.pt() < 50.0) {

Check failure on line 280 in PWGCF/TableProducer/dptDptFilter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (p.eta() < 1.0 && -1.0 < p.eta()) {
inelgth0 = true;
}
Expand Down Expand Up @@ -359,13 +359,13 @@

struct DptDptFilter {
struct : ConfigurableGroup {
Configurable<std::string> cfgCCDBUrl{"input_ccdburl", "http://ccdb-test.cern.ch:8080", "The CCDB url for the input file"};

Check failure on line 362 in PWGCF/TableProducer/dptDptFilter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> cfgCCDBPathName{"input_ccdbpath", "", "The CCDB path for the input file. Default \"\", i.e. don't load from CCDB"};

Check failure on line 363 in PWGCF/TableProducer/dptDptFilter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> cfgCCDBDate{"input_ccdbdate", "20220307", "The CCDB date for the input file"};

Check failure on line 364 in PWGCF/TableProducer/dptDptFilter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> cfgCCDBPeriod{"input_ccdbperiod", "LHC22o", "The CCDB dataset period for the input file"};

Check failure on line 365 in PWGCF/TableProducer/dptDptFilter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
} cfginputfile;
Configurable<bool> cfgFullDerivedData{"fullderiveddata", false, "Produce the full derived data for external storage. Default false"};

Check failure on line 367 in PWGCF/TableProducer/dptDptFilter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> cfgCentMultEstimator{"centmultestimator", "V0M", "Centrality/multiplicity estimator detector: V0M,CL0,CL1,FV0A,FT0M,FT0A,FT0C,NTPV,NOCM: none. Default V0M"};

Check failure on line 368 in PWGCF/TableProducer/dptDptFilter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)

struct : ConfigurableGroup {
std::string prefix = "cfgEventSelection";
Expand Down Expand Up @@ -1572,7 +1572,7 @@
fhAmbiguousTrackType->Fill(ambtracktype, multiplicityClass);
fhAmbiguousTrackPt->Fill(track.pt(), multiplicityClass);
fhAmbiguityDegree->Fill(zvertexes.size(), multiplicityClass);
if (ambtracktype == 2) {

Check failure on line 1575 in PWGCF/TableProducer/dptDptFilter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
fhCompatibleCollisionsZVtxRms->Fill(-computeRMS(zvertexes), multiplicityClass);
} else {
fhCompatibleCollisionsZVtxRms->Fill(computeRMS(zvertexes), multiplicityClass);
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/TableProducer/dptdptfilter.h → PWGCF/TableProducer/dptDptFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

/// \file dptdptfilter.h
/// \file dptDptFilter.h
/// \brief Filters collisions and tracks according to selection criteria
/// \author victor.gonzalez.sebastian@gmail.com

Expand Down
4 changes: 2 additions & 2 deletions PWGCF/Tasks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

o2physics_add_dpl_workflow(dptdptcorrelations
SOURCES dptdptcorrelations.cxx
o2physics_add_dpl_workflow(dpt-dpt-correlations
SOURCES dptDptCorrelations.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
COMPONENT_NAME Analysis)

Expand Down
4 changes: 2 additions & 2 deletions PWGCF/Tasks/dptdptcorrelations.cxx → PWGCF/Tasks/dptDptCorrelations.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

/// \file dptdptcorrelations.cxx
/// \file dptDptCorrelations.cxx
/// \brief implements two-particle correlations base data collection
/// \author victor.gonzalez.sebastian@gmail.com

Expand Down Expand Up @@ -44,7 +44,7 @@
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
#include "PWGCF/Core/PairCuts.h"
#include "PWGCF/DataModel/DptDptFiltered.h"
#include "PWGCF/TableProducer/dptdptfilter.h"
#include "PWGCF/TableProducer/dptDptFilter.h"

using namespace o2;
using namespace o2::framework;
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Tasks/dptDptFilterQa.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "Framework/AnalysisTask.h"
#include "Framework/runDataProcessing.h"
#include "PWGCF/DataModel/DptDptFiltered.h"
#include "PWGCF/TableProducer/dptdptfilter.h"
#include "PWGCF/TableProducer/dptDptFilter.h"

using namespace o2;
using namespace o2::framework;
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Tasks/matchRecoGen.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "Framework/runDataProcessing.h"
#include "PWGCF/Core/AnalysisConfigurableCuts.h"
#include "PWGCF/DataModel/DptDptFiltered.h"
#include "PWGCF/TableProducer/dptdptfilter.h"
#include "PWGCF/TableProducer/dptDptFilter.h"
#include <TDirectory.h>
#include <TFolder.h>
#include <TH1.h>
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/TwoParticleCorrelations/Tasks/dptDptEfficiencyAndQc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

#include "PWGCF/Core/AnalysisConfigurableCuts.h"
#include "PWGCF/DataModel/DptDptFiltered.h"
#include "PWGCF/TableProducer/dptdptfilter.h"
#include "PWGCF/TableProducer/dptDptFilter.h"

using namespace o2;
using namespace o2::framework;
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunExtraQc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "Framework/runDataProcessing.h"

#include "PWGCF/DataModel/DptDptFiltered.h"
#include "PWGCF/TableProducer/dptdptfilter.h"
#include "PWGCF/TableProducer/dptDptFilter.h"

using namespace o2;
using namespace o2::framework;
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/TwoParticleCorrelations/Tasks/dptDptPerRunQc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "Framework/runDataProcessing.h"

#include "PWGCF/DataModel/DptDptFiltered.h"
#include "PWGCF/TableProducer/dptdptfilter.h"
#include "PWGCF/TableProducer/dptDptFilter.h"

using namespace o2;
using namespace o2::framework;
Expand Down
Loading