Skip to content

Please consider the following formatting changes to #15468 #1

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

Open
alibuild wants to merge 1 commit into
base: feature/its-stuck-pixels
Choose a base branch
from
Open

Please consider the following formatting changes to #15468 #1

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
10 changes: 5 additions & 5 deletions DataFormats/Detectors/ITSMFT/common/include/DataFormatsITSMFT/StuckPixelData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <vector>
#include <cstdint>
#include <Rtypes.h> // ClassDefNV
#include <Rtypes.h> // ClassDefNV

namespace o2
{
Expand All @@ -35,10 +35,10 @@ namespace itsmft

/// One stuck-pixel (RepeatingPixel error) record.
struct StuckPixelEntry {
Long64_t orbit{0}; ///< first orbit of the TF in which the error was seen
uint16_t chipID{0}; ///< global chip ID (ITS only)
uint16_t row{0}; ///< pixel row
uint16_t col{0}; ///< pixel column
Long64_t orbit{0}; ///< first orbit of the TF in which the error was seen
uint16_t chipID{0}; ///< global chip ID (ITS only)
uint16_t row{0}; ///< pixel row
uint16_t col{0}; ///< pixel column

StuckPixelEntry() = default;
StuckPixelEntry(Long64_t o, uint16_t c, uint16_t r, uint16_t col_)
Expand Down
15 changes: 8 additions & 7 deletions Detectors/ITSMFT/common/workflow/include/ITSMFTWorkflow/DeadMapBuilderSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,18 @@ class ITSMFTDeadMapBuilder : public Task
=======

std::string mStuckPixelFileName = "";
TTree* mErrorTree = nullptr;
Long64_t mErrOrbit = 0;
UShort_t mErrChipID = 0;
UShort_t mErrRow = 0;

TTree* mErrorTree = nullptr;
Long64_t mErrOrbit = 0;
UShort_t mErrChipID = 0;
UShort_t mErrRow = 0;
UShort_t mErrCol = 0;
>>>>>>> 5df4d36ff6 (Add ITS stuck-pixel CCDB object output)
};
6
// Create a processor spec
o2::framework::DataProcessorSpec getITSMFTDeadMapBuilderSpec(std::string datasource, bool doMFT);
// Create a processor spec
o2::framework::DataProcessorSpec
getITSMFTDeadMapBuilderSpec(std::string datasource, bool doMFT);

} // namespace itsmft
} // namespace o2
Expand Down
8 changes: 3 additions & 5 deletions Detectors/ITSMFT/common/workflow/src/DeadMapBuilderSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "DataFormatsITSMFT/Digit.h"
#include "DataFormatsITSMFT/CompCluster.h"
#include "DataFormatsITSMFT/TimeDeadMap.h"
#include "DataFormatsITSMFT/StuckPixelData.h" // NEW
#include "DataFormatsITSMFT/StuckPixelData.h" // NEW
#include "ITSMFTReconstruction/DecodingStat.h"
#include <TFile.h>

Expand Down Expand Up @@ -375,8 +375,7 @@ void ITSMFTDeadMapBuilder::PrepareOutputCcdb(EndOfStreamContext* ec, std::string
long tend = o2::ccdb::getCurrentTimestamp();
std::map<std::string, std::string> md = {
{"map_version", MAP_VERSION},
{"runNumber", std::to_string(mRunNumber)}
};
{"runNumber", std::to_string(mRunNumber)}};

std::string path = mRunMFT ? "MFT/Calib/" : "ITS/Calib/";

Expand Down Expand Up @@ -570,8 +569,7 @@ DataProcessorSpec getITSMFTDeadMapBuilderSpec(std::string datasource, bool doMFT
{"outfile", VariantType::String, objectname_default, {"ROOT object file name."}},
{"local-output", VariantType::Bool, false, {"Save ROOT file locally."}},
{"output-dir", VariantType::String, std::string("./"), {"Local output directory."}},
{"save-stuck-pixels", VariantType::String, std::string(""),
{"Enable ITS stuck-pixel collection and set the CCDB/local ROOT filename. Empty = disabled."}},
{"save-stuck-pixels", VariantType::String, std::string(""), {"Enable ITS stuck-pixel collection and set the CCDB/local ROOT filename. Empty = disabled."}},
}};
}

Expand Down
Loading