Skip to content

remove temporary code #8637

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
jgrosseo merged 2 commits into from
Apr 24, 2022
Merged

remove temporary code #8637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a291342
remove temporary code
jgrosseo Apr 22, 2022
d75ff26
fix
jgrosseo Apr 23, 2022
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
13 changes: 0 additions & 13 deletions Framework/Core/include/Framework/AnalysisDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,19 +1003,6 @@ DECLARE_SOA_INDEX_TABLE(Run3MatchedToBCSparse, BCs, "MA_RN3_BC_SP", //!
DECLARE_SOA_INDEX_TABLE(Run2MatchedToBCSparse, BCs, "MA_RN2_BC_SP", //!
indices::BCId, indices::ZdcId, indices::FT0Id, indices::FV0AId, indices::FV0CId, indices::FDDId);

// temporary code during transition from FDD_000 to FDD_001
namespace indices_fdd_001
{
using FDD_001 = FDDs_001::iterator;
DECLARE_SOA_INDEX_COLUMN_FULL(FDD_001, fdd, int, FDDs_001, ""); //!
} // namespace indices_fdd_001
DECLARE_SOA_INDEX_TABLE(Run3MatchedToBCSparseFDD_001, BCs, "MA_RN3_BC_SP2", //!
indices::BCId, indices::ZdcId, indices::FT0Id, indices::FV0AId, indices_fdd_001::FDD_001Id);

DECLARE_SOA_INDEX_TABLE(Run2MatchedToBCSparseFDD_001, BCs, "MA_RN2_BC_SP2", //!
indices::BCId, indices::ZdcId, indices::FT0Id, indices::FV0AId, indices::FV0CId, indices_fdd_001::FDD_001Id);
// temporary code end

// Joins with collisions (only for sparse ones)
// NOTE: index table needs to be always last argument
} // namespace aod
Expand Down
4 changes: 0 additions & 4 deletions Framework/Core/src/AODReaderHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,6 @@ AlgorithmSpec AODReaderHelpers::indexBuilderCallback(std::vector<InputSpec>& req
outputs.adopt(Output{origin, description}, maker(o2::aod::Run3MatchedToBCExclusiveMetadata{}));
} else if (description == header::DataDescription{"MA_RN2_BC_SP"}) {
outputs.adopt(Output{origin, description}, maker(o2::aod::Run2MatchedToBCSparseMetadata{}));
} else if (description == header::DataDescription{"MA_RN2_BC_SP2"}) {
outputs.adopt(Output{origin, description}, maker(o2::aod::Run2MatchedToBCSparseFDD_001Metadata{}));
} else if (description == header::DataDescription{"MA_RN3_BC_SP2"}) {
outputs.adopt(Output{origin, description}, maker(o2::aod::Run3MatchedToBCSparseFDD_001Metadata{}));
} else {
throw std::runtime_error("Not an index table");
}
Expand Down