---

yaml --- r: 132111 b: refs/heads/gem-CR-stand c: d318f22 h: "refs/heads/CMSSW_6_2_X_SLHC" i: 132109: 5017623 132107: 8ab1c40 132103: 22827e4 132095: 06169c0
cms-sw · Nov 7, 2013 · ca07369 · ca07369
1 parent 429d404
commit ca07369
Show file tree

Hide file tree

Showing 38 changed files with 88 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -2,4 +2,4 @@
 refs/heads/gh-pages: 4bec1f03ca2f14e90d0ca17351c4d42d84ec2c82
 "refs/heads/CMSSW_6_2_X_SLHC": 5893ef29c12b2718b3c1385e821170f91afb5446
 "refs/heads/CMSSW_5_3_X": 90eebdc93fdcd1c69c8670cdb1376c336a5876bd
-refs/heads/gem-CR-stand: 28ca31e9786e97aa7c68c705b60e85fe113b94f8
+refs/heads/gem-CR-stand: d318f22f22b3bc1844b2cfebdc91af9a510ab291
diff --git a/branches/gem-CR-stand/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc b/branches/gem-CR-stand/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc
@@ -16,6 +16,7 @@
 #include "globals.hh"                        // Global Constants and typedefs
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleGun.hh"
+#include "G4SystemOfUnits.hh"
 
 LaserBeamsBarrel::LaserBeamsBarrel() :
   theParticleGun(0),

diff --git a/branches/gem-CR-stand/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc b/branches/gem-CR-stand/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc
@@ -16,6 +16,7 @@
 #include "globals.hh"                        // Global Constants and typedefs
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleGun.hh"
+#include "G4SystemOfUnits.hh"
 
 LaserBeamsTEC1::LaserBeamsTEC1() :
   theParticleGun(0),

diff --git a/branches/gem-CR-stand/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc b/branches/gem-CR-stand/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc
@@ -16,6 +16,7 @@
 #include "globals.hh"                        // Global Constants and typedefs
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleGun.hh"
+#include "G4SystemOfUnits.hh"
 
 LaserBeamsTEC2::LaserBeamsTEC2() :
   theParticleGun(0),

diff --git a/branches/gem-CR-stand/Alignment/LaserAlignmentSimulation/src/LaserPrimaryGeneratorAction.cc b/branches/gem-CR-stand/Alignment/LaserAlignmentSimulation/src/LaserPrimaryGeneratorAction.cc
@@ -11,6 +11,8 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "G4SystemOfUnits.hh"
+
 LaserPrimaryGeneratorAction::LaserPrimaryGeneratorAction(edm::ParameterSet const& theConf) 
   : thePhotonEnergy(0),
     thenParticleInGun(0),

diff --git a/branches/gem-CR-stand/Alignment/LaserAlignmentSimulation/src/MaterialProperties.cc b/branches/gem-CR-stand/Alignment/LaserAlignmentSimulation/src/MaterialProperties.cc
@@ -11,6 +11,9 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "G4SystemOfUnits.hh"
+
+
 	MaterialProperties::MaterialProperties(int DebugLevel, double SiAbsLengthScale) 
 	: theMaterialTable(), theMPDebugLevel(0), 
 	theSiAbsLengthScalingFactor(0),

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/CaloG4Hit.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/CaloG4Hit.cc
@@ -5,6 +5,8 @@
 #include "SimG4CMS/Calo/interface/CaloG4Hit.h"
 #include <iostream>
 
+#include "G4SystemOfUnits.hh"
+
 G4Allocator<CaloG4Hit> CaloG4HitAllocator;
 
 CaloG4Hit::CaloG4Hit(){

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/CaloSD.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/CaloSD.cc
@@ -16,6 +16,9 @@
 #include "G4GFlashSpot.hh"
 #include "G4ParticleTable.hh"
 
+#include "G4SystemOfUnits.hh"
+#include "G4PhysicalConstants.hh"
+
 //#define DebugLog
 
 CaloSD::CaloSD(G4String name, const DDCompactView & cpv,

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/CaloTrkProcessing.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/CaloTrkProcessing.cc
@@ -17,6 +17,8 @@
 #include "G4Step.hh"
 #include "G4Track.hh"
 
+#include "G4SystemOfUnits.hh"
+
 //#define DebugLog
 
 CaloTrkProcessing::CaloTrkProcessing(G4String name, 

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/ECalSD.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/ECalSD.cc
@@ -24,6 +24,8 @@
 #include "G4Track.hh"
 #include "G4VProcess.hh"
 
+#include "G4SystemOfUnits.hh"
+
 #include<algorithm>
 
 //#define DebugLog

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HCalSD.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HCalSD.cc
@@ -29,6 +29,8 @@
 #include <fstream>
 #include <iomanip>
 
+#include "G4SystemOfUnits.hh"
+
 //#define DebugLog
 //#define plotDebug
 

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HFCherenkov.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HFCherenkov.cc
@@ -9,6 +9,8 @@
 #include "G4ParticleDefinition.hh"
 #include "G4NavigationHistory.hh"
 #include "TMath.h"
+#include "G4SystemOfUnits.hh"
+#include "Randomize.hh"
 
 //#define DebugLog
 

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HFFibre.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HFFibre.cc
@@ -11,6 +11,7 @@
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
 #include <iostream>
 
 //#define DebugLog

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HFFibreFiducial.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HFFibreFiducial.cc
@@ -3,6 +3,7 @@
 
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+
 #include<iostream>
 
 //#define DebugLog

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HFGflash.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HFGflash.cc
@@ -27,6 +27,9 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
+
 #include <math.h>
 
 //#define DebugLog

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HFShower.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HFShower.cc
@@ -17,6 +17,7 @@
 #include "G4VSolid.hh"
 #include "Randomize.hh"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 
 //#define DebugLog
 

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HFShowerLibrary.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HFShowerLibrary.cc
@@ -17,6 +17,7 @@
 #include "G4Track.hh"
 #include "Randomize.hh"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
 
 //#define DebugLog
 

diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HFShowerParam.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HFShowerParam.cc
@@ -20,6 +20,7 @@
 
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+
 #include<iostream>
 
 //#define DebugLog

diff --git a/branches/gem-CR-stand/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc b/branches/gem-CR-stand/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc
@@ -22,6 +22,9 @@
 #include "SimG4CMS/CherenkovAnalysis/interface/DreamSD.h"
 #include "SimG4CMS/CherenkovAnalysis/interface/PMTResponse.h"
 
+#include "G4SystemOfUnits.hh"
+#include "G4PhysicalConstants.hh"
+
 //________________________________________________________________________________________
 DreamSD::DreamSD(G4String name, const DDCompactView & cpv,
 	       SensitiveDetectorCatalog & clg, 

diff --git a/branches/gem-CR-stand/SimG4CMS/EcalTestBeam/interface/EcalTBH4Trigger.h b/branches/gem-CR-stand/SimG4CMS/EcalTestBeam/interface/EcalTBH4Trigger.h
@@ -29,6 +29,8 @@
 #include "G4VProcess.hh"
 #include "G4VTouchable.hh"
 
+#include "CLHEP/Units/SystemOfUnits.h"
+
 // forward declarations
 class DDDWorld;
 class BeginOfJob;
@@ -106,18 +108,22 @@ class EcalTBH4Trigger : public SimWatcher,
 	const G4Track* theTrack = iStep->GetTrack();
 	const G4ThreeVector pos = post->GetPosition();
 	std::cout << "( "<<pos.x()<<","<<pos.y()<<","<<pos.z()<<") ";
-	std::cout << " released energy (MeV) " <<  iStep->GetTotalEnergyDeposit()/MeV  ;
+	std::cout << " released energy (MeV) " 
+		  <<  iStep->GetTotalEnergyDeposit()/CLHEP::MeV  ;
 	if (theTrack)
 	  {
 	    const G4ThreeVector mom = theTrack->GetMomentum();
-	    std::cout << " track length (cm) " << theTrack->GetTrackLength()/cm
+	    std::cout << " track length (cm) " << theTrack->GetTrackLength()/CLHEP::cm
 		      << " particle type " << theTrack->GetDefinition()->GetParticleName()
 		      << " momentum " << "( "<<mom.x()<<","<<mom.y()<<","<<mom.z()<<") ";
-	    if (theTrack->GetCreatorProcess())
-	      std::cout << " created by " << theTrack->GetCreatorProcess()->GetProcessName();
+	    if (theTrack->GetCreatorProcess()) {
+	      std::cout << " created by " 
+			<< theTrack->GetCreatorProcess()->GetProcessName();
+	    }
 	  }
 	if(post->GetPhysicalVolume()) {
-	  std::cout << " " << pre->GetPhysicalVolume()->GetName() << "->" << post->GetPhysicalVolume()->GetName();
+	  std::cout << " " << pre->GetPhysicalVolume()->GetName() 
+		    << "->" << post->GetPhysicalVolume()->GetName();
 	}
 	std::cout <<std::endl; 
       }

diff --git a/branches/gem-CR-stand/SimG4CMS/EcalTestBeam/src/EcalTBH4BeamSD.cc b/branches/gem-CR-stand/SimG4CMS/EcalTestBeam/src/EcalTBH4BeamSD.cc
@@ -17,6 +17,8 @@
 #include "G4Track.hh"
 #include "G4VProcess.hh"
 
+#include "G4SystemOfUnits.hh"
+
 EcalTBH4BeamSD::EcalTBH4BeamSD(G4String name, const DDCompactView & cpv,
 			       SensitiveDetectorCatalog & clg, 
 			       edm::ParameterSet const & p, 

diff --git a/branches/gem-CR-stand/SimG4CMS/FP420/plugins/FP420SD.cc b/branches/gem-CR-stand/SimG4CMS/FP420/plugins/FP420SD.cc
@@ -35,6 +35,8 @@
 #include "G4Step.hh"
 #include "G4ParticleTable.hh"
 
+#include "G4SystemOfUnits.hh"
+
 #include <string>
 #include <vector>
 #include <iostream>

diff --git a/branches/gem-CR-stand/SimG4CMS/Forward/src/BscSD.cc b/branches/gem-CR-stand/SimG4CMS/Forward/src/BscSD.cc
@@ -34,6 +34,9 @@
 #include "G4Step.hh"
 #include "G4ParticleTable.hh"
 
+#include "G4PhysicalConstants.hh"
+#include "G4SystemOfUnits.hh"
+
 #include <string>
 #include <vector>
 #include <iostream>

diff --git a/branches/gem-CR-stand/SimG4CMS/Forward/src/CastorSD.cc b/branches/gem-CR-stand/SimG4CMS/Forward/src/CastorSD.cc
@@ -22,6 +22,7 @@
 #include "G4LogicalVolumeStore.hh"
 
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
 #include "Randomize.hh"
 #include "G4Poisson.hh"
 

diff --git a/branches/gem-CR-stand/SimG4CMS/Forward/src/PLTSensitiveDetector.cc b/branches/gem-CR-stand/SimG4CMS/Forward/src/PLTSensitiveDetector.cc
@@ -24,6 +24,8 @@
 #include "G4Event.hh"
 #include "G4VProcess.hh"
 
+#include "G4SystemOfUnits.hh"
+
 #include <string>
 #include <vector>
 #include <iostream>

diff --git a/branches/gem-CR-stand/SimG4CMS/Forward/src/TotemSD.cc b/branches/gem-CR-stand/SimG4CMS/Forward/src/TotemSD.cc
@@ -38,6 +38,10 @@
 #include "G4Track.hh"
 #include "G4VProcess.hh"
 
+#include "G4PhysicalConstants.hh"
+#include "G4SystemOfUnits.hh"
+
+
 //
 // constructors and destructor
 //

diff --git a/branches/gem-CR-stand/SimG4CMS/Forward/src/ZdcSD.cc b/branches/gem-CR-stand/SimG4CMS/Forward/src/ZdcSD.cc
@@ -6,15 +6,17 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include "SimG4CMS/Forward/interface/ZdcSD.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimG4Core/Notification/interface/TrackInformation.h"
+
 #include "G4SDManager.hh"
 #include "G4Step.hh"
 #include "G4Track.hh"
 #include "G4VProcess.hh"
- #include "SimG4Core/Notification/interface/TrackInformation.h"
 #include "G4ios.hh"
 #include "G4Cerenkov.hh"
 #include "G4ParticleTable.hh"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
 #include "Randomize.hh"
 #include "G4Poisson.hh"
 

diff --git a/branches/gem-CR-stand/SimG4CMS/HcalTestBeam/src/HcalTB02HcalNumberingScheme.cc b/branches/gem-CR-stand/SimG4CMS/HcalTestBeam/src/HcalTB02HcalNumberingScheme.cc
@@ -16,6 +16,8 @@
 #include "SimG4CMS/HcalTestBeam/interface/HcalTB02HcalNumberingScheme.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "G4SystemOfUnits.hh"
+
 using namespace std;
 
 //

diff --git a/branches/gem-CR-stand/SimG4CMS/HcalTestBeam/src/HcalTB02SD.cc b/branches/gem-CR-stand/SimG4CMS/HcalTestBeam/src/HcalTB02SD.cc
@@ -27,6 +27,8 @@
 #include "G4Track.hh"
 #include "G4VProcess.hh"
 
+#include "G4SystemOfUnits.hh"
+
 //
 // constructors and destructor
 //

diff --git a/branches/gem-CR-stand/SimG4CMS/Muon/src/MuonSensitiveDetector.cc b/branches/gem-CR-stand/SimG4CMS/Muon/src/MuonSensitiveDetector.cc
@@ -21,6 +21,7 @@
 #include "G4SDManager.hh"
 #include "G4VProcess.hh"
 #include "G4EventManager.hh"
+#include "G4SystemOfUnits.hh"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

diff --git a/branches/gem-CR-stand/SimG4CMS/ShowerLibraryProducer/src/CastorShowerLibraryMaker.cc b/branches/gem-CR-stand/SimG4CMS/ShowerLibraryProducer/src/CastorShowerLibraryMaker.cc
@@ -24,6 +24,9 @@
 
 #include "SimDataFormats/CaloHit/interface/CastorShowerEvent.h"
 
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
+
 #include "TFile.h"
 #include <cmath>
 #include <iostream>

diff --git a/branches/gem-CR-stand/SimG4CMS/ShowerLibraryProducer/src/HFChamberSD.cc b/branches/gem-CR-stand/SimG4CMS/ShowerLibraryProducer/src/HFChamberSD.cc
@@ -13,6 +13,9 @@
 #include "G4SDManager.hh"
 #include "G4ios.hh"
 
+#include "G4PhysicalConstants.hh"
+#include "G4SystemOfUnits.hh"
+
 HFChamberSD::HFChamberSD(std::string name, const DDCompactView & cpv,
 		 SensitiveDetectorCatalog & clg, edm::ParameterSet const & p,
 		 const SimTrackManager* manager) :

diff --git a/branches/gem-CR-stand/SimG4CMS/ShowerLibraryProducer/src/HFWedgeSD.cc b/branches/gem-CR-stand/SimG4CMS/ShowerLibraryProducer/src/HFWedgeSD.cc
@@ -13,6 +13,9 @@
 #include "G4SDManager.hh"
 #include "G4ios.hh"
 
+#include "G4PhysicalConstants.hh"
+#include "G4SystemOfUnits.hh"
+
 HFWedgeSD::HFWedgeSD(std::string name, const DDCompactView & cpv, 
 		 SensitiveDetectorCatalog & clg, edm::ParameterSet const & p, 
 		 const SimTrackManager* manager) :

diff --git a/branches/gem-CR-stand/SimG4CMS/Tracker/src/FakeFrameRotation.cc b/branches/gem-CR-stand/SimG4CMS/Tracker/src/FakeFrameRotation.cc
@@ -1,4 +1,5 @@
 #include "SimG4CMS/Tracker/interface/FakeFrameRotation.h"
+#include "G4SystemOfUnits.hh"
 
 Local3DPoint FakeFrameRotation::transformPoint(Local3DPoint & point,G4VPhysicalVolume * v=0) const {
   return Local3DPoint(point.x()/cm,point.z()/cm,-point.y()/cm);

diff --git a/branches/gem-CR-stand/SimG4CMS/Tracker/src/StandardFrameRotation.cc b/branches/gem-CR-stand/SimG4CMS/Tracker/src/StandardFrameRotation.cc
@@ -1,4 +1,5 @@
 #include "SimG4CMS/Tracker/interface/StandardFrameRotation.h"
+#include "G4SystemOfUnits.hh"
 
 Local3DPoint StandardFrameRotation::transformPoint(Local3DPoint & point,G4VPhysicalVolume * v=0) const {
   return Local3DPoint(point.x()/cm,point.y()/cm,point.z()/cm);

diff --git a/branches/gem-CR-stand/SimG4CMS/Tracker/src/TkAccumulatingSensitiveDetector.cc b/branches/gem-CR-stand/SimG4CMS/Tracker/src/TkAccumulatingSensitiveDetector.cc
@@ -31,6 +31,9 @@
 #include "G4EventManager.hh"
 #include "G4Event.hh"
 
+#include "G4SystemOfUnits.hh"
+
+
 #include <string>
 #include <vector>
 #include <iostream>

diff --git a/branches/gem-CR-stand/SimG4CMS/Tracker/src/TrackerFrameRotation.cc b/branches/gem-CR-stand/SimG4CMS/Tracker/src/TrackerFrameRotation.cc
@@ -1,4 +1,5 @@
 #include "SimG4CMS/Tracker/interface/TrackerFrameRotation.h"
+#include "G4SystemOfUnits.hh"
 
 Local3DPoint TrackerFrameRotation::transformPoint(Local3DPoint & point,G4VPhysicalVolume * v=0) const {
   return Local3DPoint(point.x()/cm,point.y()/cm,point.z()/cm);

diff --git a/branches/gem-CR-stand/SimG4Core/Physics/src/G4Monopole.cc b/branches/gem-CR-stand/SimG4Core/Physics/src/G4Monopole.cc
@@ -1,4 +1,5 @@
 #include "SimG4Core/Physics/interface/G4Monopole.hh"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "G4ParticleTable.hh"
 #include "G4PhysicalConstants.hh"
 
@@ -8,6 +9,12 @@ G4Monopole::G4Monopole(const G4String aName, G4int pdgEncoding, G4double mass,
 		       0, 0, 0, "boson", 0, 0, pdgEncoding, true, -1.0, 0) {
 
   magCharge = eplus * G4double(mCharge) / fine_structure_const * 0.5;
+
+  edm::LogInfo("G4Monopole") << "Monopole is created: m(GeV)= " 
+			     << GetPDGMass()/GeV 
+			     << " Qel= " << GetPDGCharge()/eplus
+			     << " Qmag= " << magCharge/eplus
+			     << " PDG encoding = " << pdgEncoding;
   /*
   G4cout << "Monopole is created: m(GeV)= " << GetPDGMass()/GeV 
 	 << " Qel= " << GetPDGCharge()/eplus