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
2 changes: 1 addition & 1 deletion ALICE3/Core/DelphesO2LutWriter.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

#include "ALICE3/Core/DelphesO2TrackSmearer.h"
#include "ALICE3/Core/DelphesO2LutWriter.h"
#include "iostream"
#include <iostream>

Check failure on line 26 in ALICE3/Core/DelphesO2LutWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[include-iostream]

Do not include iostream. Use O2 logging instead.
#include "TMatrixD.h"
#include "TVectorD.h"
#include "TMatrixDSymEigen.h"
#include "TDatabasePDG.h"

Check failure on line 30 in ALICE3/Core/DelphesO2LutWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/database]

Do not use TDatabasePDG directly. Use o2::constants::physics::Mass... or Service<o2::framework::O2DatabasePDG> instead.
#include "TLorentzVector.h"

Check failure on line 31 in ALICE3/Core/DelphesO2LutWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
#include "ALICE3/Core/FastTracker.h"
#include "ALICE3/Core/TrackUtilities.h"

Expand Down Expand Up @@ -59,10 +59,10 @@
{
lutEntry.valid = false;

static TLorentzVector tlv;

Check failure on line 62 in ALICE3/Core/DelphesO2LutWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
tlv.SetPtEtaPhiM(pt, eta, 0., mass);
o2::track::TrackParCov trkIn;
o2::upgrade::convertTLorentzVectorToO2Track(q, tlv, {0., 0., 0.}, trkIn);

Check failure on line 65 in ALICE3/Core/DelphesO2LutWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector]

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.

o2::track::TrackParCov trkOut;
if (fat.FastTrack(trkIn, trkOut, 1) < 0) {
Expand Down Expand Up @@ -142,7 +142,7 @@
const double dcaz_ms = sigma_alpha * r0 * std::cosh(eta);
const double dcaz2 = dca_pos * dca_pos + dcaz_ms * dcaz_ms;

const float Leta = 2.8 / sinh(eta) - 0.01 * r0; // m

Check failure on line 145 in ALICE3/Core/DelphesO2LutWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
const double relmomres_pos = 10e-6 * pt / 0.3 / Bfield / Leta / Leta * std::sqrt(720. / 15.);

const float relmomres_barrel = std::sqrt(covmbarrel[14]) * pt;
Expand All @@ -152,7 +152,7 @@

// interpolate MS contrib (rel resolution 0.4 at eta = 4)
const float relmomres_MS_eta4 = 0.4 / beta * 0.5 / Bfield;
const float relmomres_MS = relmomres_MS_eta4 * pow(relmomres_MS_eta4 / relmomres_MS_barrel, (std::fabs(eta) - 4.) / (4. - etaMaxBarrel));

Check failure on line 155 in ALICE3/Core/DelphesO2LutWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
const float momres_tot = pt * std::sqrt(relmomres_pos * relmomres_pos + relmomres_MS * relmomres_MS); // total absolute mom reso

// Fill cov matrix diag
Expand Down Expand Up @@ -411,13 +411,13 @@
val = lutEntry->otof * 100.; // efficiency (%)
break;
case kPtResolution:
val = sqrt(lutEntry->covm[14]) * lutEntry->pt * 100.; // pt resolution (%)

Check failure on line 414 in ALICE3/Core/DelphesO2LutWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
break;
case kRPhiResolution:
val = sqrt(lutEntry->covm[0]) * 1.e4; // rphi resolution (um)

Check failure on line 417 in ALICE3/Core/DelphesO2LutWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
break;
case kZResolution:
val = sqrt(lutEntry->covm[1]) * 1.e4; // z resolution (um)

Check failure on line 420 in ALICE3/Core/DelphesO2LutWriter.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
break;
default:
Printf(" --- error: unknown what %d", what);
Expand Down
4 changes: 2 additions & 2 deletions Common/CCDB/macros/upload_event_selection_params.C
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include "CCDB/CcdbApi.h"
#include "CCDB/BasicCCDBManager.h"
#include "TString.h"
#include "map"
#include "string"
#include <map>
#include <string>
#include "EventSelectionParams.h"
using std::map;
using std::string;
Expand Down
4 changes: 2 additions & 2 deletions Common/CCDB/macros/upload_event_selection_params_run3.C
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#include "CCDB/CcdbApi.h"
#include "TString.h"
#include "map"
#include "string"
#include <map>
#include <string>
#include "EventSelectionParams.h"
using std::map;
using std::string;
Expand Down
2 changes: 1 addition & 1 deletion DPG/Tasks/AOTEvent/dEdxVsOccupancyWithTrackQAinfo.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>

#include <vector>
#include "map"
#include <map>

#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
Expand Down
2 changes: 1 addition & 1 deletion DPG/Tasks/AOTEvent/detectorOccupancyQa.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/// \author Igor Altsybeev <Igor.Altsybeev@cern.ch>

#include <vector>
#include "map"
#include <map>

#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
Expand Down
4 changes: 2 additions & 2 deletions DPG/Tasks/AOTTrack/qaEventTrack.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
#include "Common/Core/TrackSelectionDefaults.h"
#include "Common/TableProducer/PID/pidTOFBase.h"

#include "string"
#include "vector"
#include <string>
#include <vector>

using namespace o2;
using namespace o2::framework;
Expand Down
6 changes: 3 additions & 3 deletions DPG/Tasks/AOTTrack/qaImpPar.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
#include "DataFormatsCalibration/MeanVertexObject.h"
#include "CommonConstants/GeomConstants.h"

#include "iostream"
#include "vector"
#include "set"
#include <iostream>
#include <vector>
#include <set>

using namespace o2::framework;
using namespace o2::framework::expressions;
Expand Down
6 changes: 3 additions & 3 deletions DPG/Tasks/AOTTrack/qaMatchEff.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
#include "Framework/RunningWorkflowInfo.h"
#include "Framework/runDataProcessing.h"
//
#include "string"
#include "vector"
#include "set"
#include <string>
#include <vector>
#include <set>
//
namespace extConfPar
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "Common/DataModel/Centrality.h"
#include "CCDB/BasicCCDBManager.h"
#include "TF1.h"
#include "string"
#include <string>
#include <TPDGCode.h>

#include "EventFiltering/Zorro.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Core/SGTrackSelector.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include "PWGUD/Core/SGSelector.h"
#include <TString.h>
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Core/UPCJpsiCentralBarrelCorrHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <vector>
#include <algorithm>
#include "CommonConstants/MathConstants.h"
#include "random"
#include <random>

using namespace o2;
using namespace o2::framework;
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/eventByevent.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include <TString.h>
#include <TTree.h>
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/exclusivePentaquark.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include <TString.h>
#include "TLorentzVector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/exclusivePhi.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include <TString.h>
#include "TLorentzVector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/exclusivePhiLeptons.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include <TString.h>
#include "TLorentzVector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/exclusivePhiLeptonsTrees.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include <TString.h>
#include "TLorentzVector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/exclusiveTwoProtons.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include <TString.h>
#include "TLorentzVector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/exclusiveTwoProtonsSG.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include <TString.h>
#include "TLorentzVector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/polarisationRho.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include <TString.h>
#include "TLorentzVector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/sgD0Analyzer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include "PWGUD/Core/SGSelector.h"
#include "Common/DataModel/PIDResponse.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/sgExclOmega.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include "PWGUD/Core/SGSelector.h"
#include "Common/DataModel/PIDResponse.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/sgExclusivePhi.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include <TString.h>
#include "TLorentzVector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/sgExclusivePhiITSselections.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include <TString.h>
#include "TLorentzVector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/sgFourPiAnalyzer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include "PWGUD/Core/SGSelector.h"
#include "PWGUD/Core/SGTrackSelector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/sgInclJpsi.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include "PWGUD/Core/SGSelector.h"
#include "Common/DataModel/PIDResponse.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/sgSixPiAnalyzer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include "PWGUD/Core/SGSelector.h"
#include "PWGUD/Core/SGTrackSelector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/sgSpectraAnalyzer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include "PWGUD/Core/SGSelector.h"
#include "PWGUD/Core/SGTrackSelector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/sgTwoPiAnalyzer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Framework/O2DatabasePDGPlugin.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include "PWGUD/Core/SGSelector.h"
#include "PWGUD/Core/SGTrackSelector.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/upcForward.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ for now AO2D.root I am using is
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "Common/DataModel/EventSelection.h"
#include "iostream"
#include <iostream>
#include <TH1D.h>
#include <TH2D.h>
#include <TString.h>
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/upcPionAnalysis.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisTask.h"
#include "Framework/AnalysisDataModel.h"
#include "iostream"
#include <iostream>
#include "PWGUD/DataModel/UDTables.h"
#include <TString.h>
#include <TTree.h>
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/upcRhoAnalysis.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "Framework/AnalysisDataModel.h"
#include "Framework/runDataProcessing.h"

#include "random"
#include <random>
#include "TLorentzVector.h"

#include "Common/DataModel/PIDResponse.h"
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/upcRhoPrimeAnalysis.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "Framework/runDataProcessing.h"

#include "Math/Vector4D.h" // similiar to TLorentzVector (which is now legacy apparently)
#include "random"
#include <random>

#include "Common/DataModel/PIDResponse.h"

Expand Down
2 changes: 1 addition & 1 deletion Tutorials/PWGUD/UDTutorial_05.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// or submit itself to any jurisdiction.
//

#include "iostream"
#include <iostream>
#include "TLorentzVector.h"
#include "TDatabasePDG.h"

Expand Down
2 changes: 1 addition & 1 deletion Tutorials/PWGUD/UDTutorial_07.cxx
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.
//
#include "iostream"
#include <iostream>
#include <TString.h>
#include <TTree.h>
#include "Framework/runDataProcessing.h"
Expand Down
Loading