Skip to content
Merged
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
8 changes: 4 additions & 4 deletions Common/TableProducer/trackPropagationTester.cxx
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 Common/TableProducer/trackPropagationTester.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Provide mandatory file documentation.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -8,7 +8,7 @@
// 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.

Check failure on line 11 in Common/TableProducer/trackPropagationTester.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \author is missing, incorrect or misplaced.

Check failure on line 11 in Common/TableProducer/trackPropagationTester.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \brief is missing, incorrect or misplaced.

Check failure on line 11 in Common/TableProducer/trackPropagationTester.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \file is missing, incorrect or misplaced.
//===============================================================
//
// Experimental version of the track propagation task
Expand Down Expand Up @@ -52,10 +52,10 @@
// using namespace o2::framework::expressions;

struct TrackPropagationTester {
o2::common::standardCCDBLoaderConfigurables standardCCDBLoaderConfigurables;
o2::common::trackPropagationProducts trackPropagationProducts;
o2::common::trackPropagationConfigurables trackPropagationConfigurables;
o2::common::standardCCDBLoaderConfigurables standardCCDBLoaderConfigurables;
o2::common::trackPropagationProducts trackPropagationProducts;
o2::common::trackPropagationConfigurables trackPropagationConfigurables;

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

o2::common::StandardCCDBLoader ccdbLoader;
Expand Down
21 changes: 11 additions & 10 deletions Common/Tools/StandardCCDBLoader.h
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 Common/Tools/StandardCCDBLoader.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Provide mandatory file documentation.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -8,7 +8,7 @@
// 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.

Check failure on line 11 in Common/Tools/StandardCCDBLoader.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \author is missing, incorrect or misplaced.

Check failure on line 11 in Common/Tools/StandardCCDBLoader.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \brief is missing, incorrect or misplaced.

Check failure on line 11 in Common/Tools/StandardCCDBLoader.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \file is missing, incorrect or misplaced.
#ifndef COMMON_TOOLS_STANDARDCCDBLOADER_H_
#define COMMON_TOOLS_STANDARDCCDBLOADER_H_

Expand All @@ -27,14 +27,14 @@
namespace common
{

// ConfigurableGroup with locations
// ConfigurableGroup with locations
struct standardCCDBLoaderConfigurables : o2::framework::ConfigurableGroup {

Check failure on line 31 in Common/Tools/StandardCCDBLoader.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/struct]

Use UpperCamelCase for names of structs.
std::string prefix = "ccdb";
o2::framework::Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
o2::framework::Configurable<std::string> lutPath{"lutPath", "GLO/Param/MatLUT", "Path of the Lut parametrization"};
o2::framework::Configurable<std::string> geoPath{"geoPath", "GLO/Config/GeometryAligned", "Path of the geometry file"};
o2::framework::Configurable<std::string> grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};
o2::framework::Configurable<std::string> mVtxPath{"mVtxPath", "GLO/Calib/MeanVertex", "Path of the mean vertex file"};
std::string prefix = "ccdb";
o2::framework::Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
o2::framework::Configurable<std::string> lutPath{"lutPath", "GLO/Param/MatLUT", "Path of the Lut parametrization"};
o2::framework::Configurable<std::string> geoPath{"geoPath", "GLO/Config/GeometryAligned", "Path of the geometry file"};
o2::framework::Configurable<std::string> grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};
o2::framework::Configurable<std::string> mVtxPath{"mVtxPath", "GLO/Calib/MeanVertex", "Path of the mean vertex file"};
};

class StandardCCDBLoader
Expand All @@ -54,8 +54,9 @@
o2::base::MatLayerCylSet* lut = nullptr;
int runNumber = -1;

template <typename TConfigurableGroup,typename TCCDB>
void init(TConfigurableGroup const& cGroup, TCCDB& ccdb){
template <typename TConfigurableGroup, typename TCCDB>
void init(TConfigurableGroup const& cGroup, TCCDB& ccdb)
{
ccdb->setCaching(true);
ccdb->setLocalObjectValidityChecking();
ccdb->setURL(cGroup.ccdburl.value);
Expand Down Expand Up @@ -103,7 +104,7 @@
}
};

} // namespace common
} // namespace common
} // namespace o2

#endif // COMMON_TOOLS_STANDARDCCDBLOADER_H_
3 changes: 1 addition & 2 deletions Common/Tools/TrackPropagationModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@
class TrackPropagationModule
{
public:
TrackPropagationModule()
{
TrackPropagationModule(){
// constructor
};

Expand Down Expand Up @@ -137,7 +136,7 @@
}
}

for (auto& track : tracks) {

Check failure on line 139 in Common/Tools/TrackPropagationModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop]

Use constant references for non-modified iterators in range-based for loops.
if (fillTracksCov) {
if (fillTracksDCA || fillTracksDCACov) {
mDcaInfoCov.set(999, 999, 999, 999, 999);
Expand Down
Loading