Skip to content

Move commons.h to DataFormats/HGCalReco to break cyclic dep #45208

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
cmsbuild merged 2 commits into from
Jun 20, 2024
Merged

Move commons.h to DataFormats/HGCalReco to break cyclic dep #45208

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
416f488
Move commons.h to DataFormats/HGCalReco to break cyclic dep
smuzaffar Jun 12, 2024
5e23d50
merge commons.h in to Common.h
smuzaffar Jun 13, 2024
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
40 changes: 40 additions & 0 deletions DataFormats/HGCalReco/interface/Common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <array>
#include <cstdint>

#include "DataFormats/HGCalReco/interface/Trackster.h"

namespace ticl {
struct TileConstants {
static constexpr float minEta = 1.5f;
Expand Down Expand Up @@ -32,4 +34,42 @@ namespace ticl {
typedef std::vector<std::pair<unsigned int, float> > TICLClusterFilterMask;
} // namespace ticl

namespace ticl {

//constants
constexpr double mpion = 0.13957;
constexpr float mpion2 = mpion * mpion;
typedef math::XYZVectorF Vector;

inline Trackster::ParticleType tracksterParticleTypeFromPdgId(int pdgId, int charge) {
if (pdgId == 111) {
return Trackster::ParticleType::neutral_pion;
} else {
pdgId = std::abs(pdgId);
if (pdgId == 22) {
return Trackster::ParticleType::photon;
} else if (pdgId == 11) {
return Trackster::ParticleType::electron;
} else if (pdgId == 13) {
return Trackster::ParticleType::muon;
} else {
bool isHadron = (pdgId > 100 and pdgId < 900) or (pdgId > 1000 and pdgId < 9000);
if (isHadron) {
if (charge != 0) {
return Trackster::ParticleType::charged_hadron;
} else {
return Trackster::ParticleType::neutral_hadron;
}
} else {
return Trackster::ParticleType::unknown;
}
}
}
}

// verbosity levels for ticl algorithms
enum VerbosityLevel { None = 0, Basic, Advanced, Expert, Guru };

} // namespace ticl

#endif // DataFormats_HGCalReco_Common_h
2 changes: 1 addition & 1 deletion DataFormats/HGCalReco/interface/TICLCandidate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "DataFormats/Math/interface/Point3D.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "RecoHGCal/TICL/interface/commons.h"
#include "Common.h"

#include "FWCore/MessageLogger/interface/MessageLogger.h"

Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/interface/PatternRecognitionAlgoBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "DataFormats/Common/interface/ValueMap.h"
#include "RecoHGCal/TICL/interface/GlobalCache.h"
#include "RecoHGCal/TICL/interface/commons.h"
#include "DataFormats/HGCalReco/interface/Common.h"
#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "PhysicsTools/TensorFlow/interface/TensorFlow.h"

Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/interface/TICLInterpretationAlgoBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h"
#include "Geometry/HGCalCommonData/interface/HGCalDDDConstants.h"
#include "RecoHGCal/TICL/interface/GlobalCache.h"
#include "RecoHGCal/TICL/interface/commons.h"
#include "DataFormats/HGCalReco/interface/Common.h"
#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "PhysicsTools/TensorFlow/interface/TensorFlow.h"
#include "CommonTools/RecoAlgos/interface/MultiVectorManager.h"
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/interface/TracksterLinkingAlgoBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "FWCore/Framework/interface/EventSetup.h"
#include "DataFormats/Common/interface/ValueMap.h"
#include "RecoHGCal/TICL/interface/GlobalCache.h"
#include "RecoHGCal/TICL/interface/commons.h"
#include "DataFormats/HGCalReco/interface/Common.h"
#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "PhysicsTools/TensorFlow/interface/TensorFlow.h"
#include "CommonTools/RecoAlgos/interface/MultiVectorManager.h"
Expand Down
47 changes: 0 additions & 47 deletions RecoHGCal/TICL/interface/commons.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion RecoHGCal/TICL/plugins/HGCGraph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

#include <vector>

#include "DataFormats/HGCalReco/interface/Common.h"
#include "DataFormats/HGCalReco/interface/TICLLayerTile.h"
#include "DataFormats/HGCalReco/interface/TICLSeedingRegion.h"
#include "HGCDoublet.h"
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/LinkingAlgoByDirectionGeometric.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <memory>
#include <array>
#include "RecoHGCal/TICL/plugins/LinkingAlgoBase.h"
#include "RecoHGCal/TICL/interface/commons.h"
#include "DataFormats/HGCalReco/interface/Common.h"

#include "FWCore/Framework/interface/Frameworkfwd.h"
#include "FWCore/Framework/interface/ESHandle.h"
Expand Down
2 changes: 1 addition & 1 deletion RecoHGCal/TICL/plugins/SimTrackstersProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"

#include "RecoHGCal/TICL/interface/commons.h"
#include "DataFormats/HGCalReco/interface/Common.h"

#include "TrackstersPCA.h"
#include <vector>
Expand Down
1 change: 0 additions & 1 deletion RecoHGCal/TICL/plugins/TICLDumper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#include "RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h"

#include "SimDataFormats/Associations/interface/TracksterToSimTracksterHitLCAssociator.h"
#include "RecoHGCal/TICL/interface/commons.h"

// TFileService
#include "FWCore/ServiceRegistry/interface/Service.h"
Expand Down
2 changes: 1 addition & 1 deletion Validation/HGCalValidation/src/TICLCandidateValidator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <sstream>

#include "Validation/HGCalValidation/interface/TICLCandidateValidator.h"
#include "RecoHGCal/TICL/interface/commons.h"
#include "DataFormats/HGCalReco/interface/Common.h"

TICLCandidateValidator::TICLCandidateValidator(
edm::EDGetTokenT<std::vector<TICLCandidate>> ticlCandidates,
Expand Down