Merge pull request #3087 from skaplanhex/PLTSimulation_710pre4

Sim -- Add PLT To Event Simulation
cms-sw · Mar 31, 2014 · 9e9377d · 9e9377d
2 parents 9c32a10 + 39fb4f1
commit 9e9377d
Show file tree

Hide file tree

Showing 5 changed files with 358 additions and 268 deletions.
diff --git a/.../Forward/interface/PLTSensitiveDetector.h → SimG4CMS/Forward/interface/PltSD.h b/.../Forward/interface/PLTSensitiveDetector.h → SimG4CMS/Forward/interface/PltSD.h
@@ -1,5 +1,5 @@
-#ifndef Forward_PLTSensitiveDetector_h
-#define Forward_PLTSensitiveDetector_h
+#ifndef Forward_PltSD_h
+#define Forward_PltSD_h
 
 // system include files
 
@@ -27,17 +27,17 @@ class UpdatablePSimHit;
 class G4ProcessTypeEnumerator;
 class G4TrackToParticleID;
 
-class PLTSensitiveDetector : public SensitiveTkDetector,
+class PltSD : public SensitiveTkDetector,
                              public Observer<const BeginOfEvent*>,
                              public Observer<const BeginOfTrack*>,
                              public Observer<const BeginOfJob*> {
 
 public:
 
-  PLTSensitiveDetector(std::string, const DDCompactView &, 
+  PltSD(std::string, const DDCompactView &, 
 		       SensitiveDetectorCatalog &, 
 		       edm::ParameterSet const &, const SimTrackManager*);
-  virtual ~PLTSensitiveDetector();
+  virtual ~PltSD();
 
   virtual bool     ProcessHits(G4Step *,G4TouchableHistory *);
   virtual uint32_t setDetUnitId(G4Step*);
@@ -78,4 +78,4 @@ class PLTSensitiveDetector : public SensitiveTkDetector,
 
 };
 
-#endif
+#endif
diff --git a/SimG4CMS/Forward/plugins/module.cc b/SimG4CMS/Forward/plugins/module.cc
@@ -5,7 +5,7 @@
 #include "SimG4CMS/Forward/interface/CastorTestAnalysis.h"
 #include "SimG4CMS/Forward/interface/ZdcTestAnalysis.h"
 #include "SimG4CMS/Forward/interface/DoCastorAnalysis.h"
-#include "SimG4CMS/Forward/interface/PLTSensitiveDetector.h"
+#include "SimG4CMS/Forward/interface/PltSD.h"
 
 #include "SimG4CMS/Forward/interface/BscTest.h"
 #include "SimG4CMS/Forward/interface/BscSD.h"
@@ -23,6 +23,7 @@ typedef ZdcSD ZdcSensitiveDetector;
 DEFINE_SENSITIVEDETECTOR(ZdcSensitiveDetector);
 typedef BscSD BSCSensitiveDetector;
 DEFINE_SENSITIVEDETECTOR(BSCSensitiveDetector);
+typedef PltSD PLTSensitiveDetector;
 DEFINE_SENSITIVEDETECTOR(PLTSensitiveDetector);
 typedef Bcm1fSD BCM1FSensitiveDetector;
 DEFINE_SENSITIVEDETECTOR(BCM1FSensitiveDetector);

diff --git a/SimG4CMS/Forward/src/PLTSensitiveDetector.cc b/SimG4CMS/Forward/src/PLTSensitiveDetector.cc