match regular expression in particle name

cms-sw · Sep 9, 2017 · b7ce399 · b7ce399
1 parent 3043808
commit b7ce399
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/SimG4Core/CustomPhysics/interface/RHStopTracer.h b/SimG4Core/CustomPhysics/interface/RHStopTracer.h
@@ -21,12 +21,12 @@ class RHStopTracer :  public SimProducer,
 {
  public:
   RHStopTracer(edm::ParameterSet const & p);
-  virtual ~RHStopTracer();
-  void update(const BeginOfRun *);
-  void update(const BeginOfEvent *);
-  void update(const BeginOfTrack *);
-  void update(const EndOfTrack *);
-  void produce(edm::Event&, const edm::EventSetup&);
+  ~RHStopTracer() override;
+  void update(const BeginOfRun *) override;
+  void update(const BeginOfEvent *) override;
+  void update(const BeginOfTrack *) override;
+  void update(const EndOfTrack *) override;
+  void produce(edm::Event&, const edm::EventSetup&) override;
  private:
   struct StopPoint {
     StopPoint (const std::string& fName, double fX, double fY, double fZ, double fT, int fId, double fMass, double fCharge) 
@@ -44,7 +44,6 @@ class RHStopTracer :  public SimProducer,
   bool mStopRegular;
   double mTraceEnergy;
   std::string mTraceParticleName;
-  const G4ParticleDefinition* mParticle;
   std::vector <StopPoint> mStopPoints;
 };
 

diff --git a/SimG4Core/CustomPhysics/plugins/RHStopTracer.cc b/SimG4Core/CustomPhysics/plugins/RHStopTracer.cc
@@ -17,6 +17,8 @@
 #include "G4ParticleTable.hh"
 #include "G4ParticleDefinition.hh"
 
+#include <regex>
+
 RHStopTracer::RHStopTracer(edm::ParameterSet const & p) {
   edm::ParameterSet parameters = p.getParameter<edm::ParameterSet>("RHStopTracer");
   mStopRegular = parameters.getUntrackedParameter<bool>("stopRegularParticles", false);
@@ -31,8 +33,6 @@ RHStopTracer::RHStopTracer(edm::ParameterSet const & p) {
   produces< std::vector<float> >("StoppedParticlesMass");
   produces< std::vector<float> >("StoppedParticlesCharge");
 
-  mParticle = G4ParticleTable::GetParticleTable()->FindParticle(mTraceParticleName);
-
   edm::LogInfo("SimG4CoreCustomPhysics") 
     << "RHStopTracer::RHStopTracer " << mTraceParticleName 
     << " Eth(GeV)= " << mTraceEnergy;
@@ -55,7 +55,10 @@ void RHStopTracer::update (const BeginOfEvent * fEvent) {
 void RHStopTracer::update (const BeginOfTrack * fTrack) {
   const G4Track* track = (*fTrack)();
   const G4ParticleDefinition* part = track->GetDefinition();
-  if(part && part == mParticle &&  track->GetKineticEnergy() > mTraceEnergy) {
+  std::string stringPartName = part->GetParticleName();
+  std::regex rePartName(mTraceParticleName);
+  bool matched = std::regex_match(stringPartName,rePartName);
+  if((part && matched) ||  track->GetKineticEnergy() > mTraceEnergy) {
     LogDebug("SimG4CoreCustomPhysics") 
       << "RHStopTracer::update-> new track: ID/Name/pdgId/mass/charge/Parent: " 
       << track->GetTrackID() << '/' << part->GetParticleName() << '/' 
@@ -73,7 +76,10 @@ void RHStopTracer::update (const BeginOfTrack * fTrack) {
 void RHStopTracer::update (const EndOfTrack * fTrack) {
   const G4Track* track = (*fTrack)();
   const G4ParticleDefinition* part = track->GetDefinition();
-  if(part && part == mParticle &&  track->GetKineticEnergy() > mTraceEnergy) {
+  std::string stringPartName = part->GetParticleName();
+  std::regex rePartName(mTraceParticleName);
+  bool matched = std::regex_match(stringPartName,rePartName);
+  if((part && matched) ||  track->GetKineticEnergy() > mTraceEnergy) {
     LogDebug("SimG4CoreCustomPhysics") << 
       "RHStopTracer::update-> stop track: ID/Name/pdgId/mass/charge/Parent: " 
       << track->GetTrackID() << '/' << part->GetParticleName() << '/' 
@@ -84,6 +90,8 @@ void RHStopTracer::update (const EndOfTrack * fTrack) {
       << " R/phi: " << track->GetPosition().perp() << '/' << track->GetPosition().phi()
       << "   4vec " << track->GetMomentum();
     if (track->GetMomentum().mag () < 0.001) {
+    LogDebug("SimG4CoreCustomPhysics") << 
+      "RHStopTracer:: track has stopped, so making StopPoint";
       mStopPoints.push_back (StopPoint (track->GetDefinition()->GetParticleName(),
 					track->GetPosition().x(),
 					track->GetPosition().y(),