Skip to content

[Common,DPG,PWGDQ,PWGEM,PWGLF,PWGUD] bulk rename for include DPLAlpideParam #15676

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

Draft
f3sch wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[Common,DPG,PWGDQ,PWGEM,PWGLF,PWGUD] bulk rename for include DPLAlpideParam #15676

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
2 changes: 1 addition & 1 deletion Common/Tools/EventSelectionModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <DataFormatsCTP/Configuration.h>
#include <DataFormatsCTP/Scalers.h>
#include <DataFormatsFT0/Digit.h>
#include <DataFormatsITSMFT/DPLAlpideParam.h>
#include <DataFormatsITSMFT/TimeDeadMap.h>
#include <DataFormatsParameters/AggregatedRunInfo.h>
#include <DataFormatsParameters/GRPLHCIFData.h>
Expand All @@ -35,7 +36,6 @@
#include <Framework/HistogramRegistry.h>
#include <Framework/HistogramSpec.h>
#include <Framework/Logger.h>
#include <ITSMFTBase/DPLAlpideParam.h>
#include <ITSMFTReconstruction/ChipMappingITS.h>

#include <TH1.h>
Expand Down Expand Up @@ -706,13 +706,13 @@
float calcWeightForOccupancy(float dt)
{
float wOccup = 0;
if (dt >= -40 && dt < -5) // collisions in the past // o2-linter: disable=magic-number

Check failure on line 709 in Common/Tools/EventSelectionModule.h

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.
wOccup = 1. / 1225 * (dt + 40) * (dt + 40); // o2-linter: disable=magic-number
else if (dt >= -5 && dt < 15) // collisions near a given one // o2-linter: disable=magic-number

Check failure on line 711 in Common/Tools/EventSelectionModule.h

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.
wOccup = 1;
else if (dt >= 15 && dt < 40) // collisions from the future // o2-linter: disable=magic-number

Check failure on line 713 in Common/Tools/EventSelectionModule.h

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.
wOccup = -0.4 / 25 * dt + 1.24; // o2-linter: disable=magic-number
else if (dt >= 40 && dt < 100) // collisions from the distant future // o2-linter: disable=magic-number

Check failure on line 715 in Common/Tools/EventSelectionModule.h

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.
wOccup = -0.4 / 60 * dt + 0.6 + 0.8 / 3; // o2-linter: disable=magic-number
return wOccup;
}
Expand Down Expand Up @@ -793,7 +793,7 @@
LOGP(debug, "ITS ROF Offset={} ITS ROF Length={}", rofOffset, rofLength);

// special treatment of light ion runs
if (lastRun >= 564356 && lastRun <= 564472) {

Check failure on line 796 in Common/Tools/EventSelectionModule.h

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.
for (uint32_t i = 0; i < sizeof(runListLightIons) / sizeof(*runListLightIons); i++) {
if (runListLightIons[i] == lastRun) {
runLightIons = lastRun;
Expand All @@ -803,9 +803,9 @@
diffVzParMean = *parMeans;
diffVzParSigma = *parSigmas;
LOGP(info, ">>> special treatment for diffVz for light ion run {}", runLightIons);
for (int j = 0; j < 5; j++)

Check failure on line 806 in Common/Tools/EventSelectionModule.h

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.
LOGP(info, " mean par {} = {}", j, diffVzParMean[j]);
for (int j = 0; j < 5; j++)

Check failure on line 808 in Common/Tools/EventSelectionModule.h

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.
LOGP(info, " sigma par {} = {}", j, diffVzParSigma[j]);
break;
}
Expand Down Expand Up @@ -1035,7 +1035,7 @@
int32_t localBC = globalBC % nBCsPerOrbit;
int32_t bcFromPattern = bcsPattern.at(i);
int64_t bcDiff = bcFromPattern - localBC;
if (std::abs(bcDiff) <= 20) {

Check failure on line 1038 in Common/Tools/EventSelectionModule.h

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.
foundGlobalBC = (globalBC / nBCsPerOrbit) * nBCsPerOrbit + bcFromPattern;
break; // the bc in pattern is found
}
Expand Down Expand Up @@ -1474,10 +1474,10 @@
float T0M = multT0A + multT0C;
// calc mean at this T0 ampl.
float x = (T0M < 50 ? 50 : T0M);
double diffMean = diffVzParMean[0] + diffVzParMean[1] * pow(x, diffVzParMean[2]) + diffVzParMean[3] * pow(x, diffVzParMean[4]);

Check failure on line 1477 in Common/Tools/EventSelectionModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
// calc sigma at this T0 ampl.
x = (T0M < 20 ? 20 : (T0M > 1.2e4 ? 1.2e4 : T0M));
double diffSigma = diffVzParSigma[0] + diffVzParSigma[1] * pow(x, diffVzParSigma[2]) + diffVzParSigma[3] * pow(x, diffVzParSigma[4]);

Check failure on line 1480 in Common/Tools/EventSelectionModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
float nSigma = evselOpts.confLightIonsNsigmaOnVzDiff;
float margin = evselOpts.confLightIonsMarginVzDiff;
isGoodZvtxFT0vsPV = (diffVz > diffMean - nSigma * diffSigma - margin && diffVz < diffMean + nSigma * diffSigma + margin);
Expand Down
2 changes: 1 addition & 1 deletion DPG/Tasks/AOTEvent/eventSelectionQa.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <CommonConstants/LHCConstants.h>
#include <CommonDataFormat/BunchFilling.h>
#include <CommonDataFormat/TimeStamp.h>
#include <DataFormatsITSMFT/DPLAlpideParam.h>
#include <DataFormatsITSMFT/TimeDeadMap.h>
#include <DataFormatsParameters/AggregatedRunInfo.h>
#include <DataFormatsParameters/GRPLHCIFData.h>
Expand All @@ -35,7 +36,6 @@
#include <Framework/InitContext.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/runDataProcessing.h>
#include <ITSMFTBase/DPLAlpideParam.h>
#include <ITSMFTReconstruction/ChipMappingITS.h>
#include <ReconstructionDataFormats/Vertex.h>

Expand Down
2 changes: 1 addition & 1 deletion DPG/Tasks/AOTEvent/rofOccupancyQa.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/LHCConstants.h>
#include <DataFormatsITSMFT/DPLAlpideParam.h>
#include <DataFormatsParameters/AggregatedRunInfo.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
Expand All @@ -30,7 +31,6 @@
#include <Framework/InitContext.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/runDataProcessing.h>
#include <ITSMFTBase/DPLAlpideParam.h>

#include <cmath>
#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion PWGDQ/Tasks/tableReader_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

#include <CCDB/BasicCCDBManager.h>
#include <CCDB/CcdbApi.h>
#include <DataFormatsITSMFT/DPLAlpideParam.h>
#include <DataFormatsParameters/GRPLHCIFData.h>
#include <DataFormatsParameters/GRPMagField.h>
#include <DetectorsBase/GeometryManager.h>
Expand All @@ -42,7 +43,6 @@
#include <Framework/Configurable.h>
#include <Framework/InitContext.h>
#include <Framework/runDataProcessing.h>
#include <ITSMFTBase/DPLAlpideParam.h>

#include <TF1.h>
#include <THashList.h>
Expand Down
2 changes: 1 addition & 1 deletion PWGEM/Dilepton/Tasks/tableReaderBarrel.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "Common/CCDB/EventSelectionParams.h"

#include <CCDB/BasicCCDBManager.h>
#include <DataFormatsITSMFT/DPLAlpideParam.h>
#include <DataFormatsParameters/GRPMagField.h>
#include <DetectorsBase/MatLayerCylSet.h>
#include <DetectorsBase/Propagator.h>
Expand All @@ -35,7 +36,6 @@
#include <Framework/Configurable.h>
#include <Framework/InitContext.h>
#include <Framework/runDataProcessing.h>
#include <ITSMFTBase/DPLAlpideParam.h>

#include <THashList.h>
#include <TList.h>
Expand Down
2 changes: 1 addition & 1 deletion PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "CCDB/BasicCCDBManager.h"
#include "CommonConstants/LHCConstants.h"
#include "DataFormatsFT0/Digit.h"
#include "DataFormatsITSMFT/DPLAlpideParam.h"
#include "DataFormatsParameters/AggregatedRunInfo.h"
#include "DataFormatsParameters/GRPECSObject.h"
#include "DataFormatsParameters/GRPLHCIFData.h"
Expand All @@ -42,7 +43,6 @@
#include "Framework/O2DatabasePDGPlugin.h"
#include "Framework/StaticFor.h"
#include "Framework/runDataProcessing.h"
#include "ITSMFTBase/DPLAlpideParam.h"
#include "ReconstructionDataFormats/Track.h"

#include <TFile.h>
Expand Down
2 changes: 1 addition & 1 deletion PWGUD/Tasks/upcEventITSROFcounter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/LHCConstants.h>
#include <CommonDataFormat/TimeStamp.h>
#include <DataFormatsITSMFT/DPLAlpideParam.h>
#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
#include <Framework/AnalysisTask.h>
Expand All @@ -32,7 +33,6 @@
#include <Framework/InitContext.h>
#include <Framework/OutputObjHeader.h>
#include <Framework/runDataProcessing.h>
#include <ITSMFTBase/DPLAlpideParam.h>
#include <ReconstructionDataFormats/Vertex.h>

#include <TH1.h>
Expand Down
Loading