diff --git a/[refs] b/[refs] index adf2a4a26d0cf..b7f68d1e20e91 100644 --- 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 index 2cf61a7317d4f..218e6e071aeeb 100644 --- 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 index 67dd97580beb2..5851b73b6bb42 100644 --- 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 index 64ef3cd2a20a1..e10c99104b4fc 100644 --- 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 index ce0227ee5157c..6d77d93893f81 100644 --- 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 index f5389cedafa1c..44bf908fa068d 100644 --- 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 index 111190979f542..cbc23789e2131 100644 --- 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 +#include "G4SystemOfUnits.hh" + G4Allocator 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 index 21d3fccdd1061..19e7018870ba9 100644 --- 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 index 44696c8a4475a..95af48028fbae 100644 --- 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 index a386b7684fe6c..c5be4a2f08c1c 100644 --- 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 //#define DebugLog diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HCalSD.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HCalSD.cc index 56639d10cfdfc..44d9d7026a620 100644 --- 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 #include +#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 index 721c14b18cfda..e92295e646bcd 100644 --- 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 index b5c50b62f80de..8dacf84df14e2 100644 --- 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 //#define DebugLog diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HFFibreFiducial.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HFFibreFiducial.cc index f3cf661da9446..8c36cfe01c46a 100644 --- 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 //#define DebugLog diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HFGflash.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HFGflash.cc index a62c5d46cfa5c..4588306a4c8e2 100644 --- 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 //#define DebugLog diff --git a/branches/gem-CR-stand/SimG4CMS/Calo/src/HFShower.cc b/branches/gem-CR-stand/SimG4CMS/Calo/src/HFShower.cc index a0074651710f1..3d8ea426bff41 100644 --- 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 index 869570e8eab12..4164fb374a202 100644 --- 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 index b4cb215a249a8..f64043d80d1e3 100644 --- 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 //#define DebugLog diff --git a/branches/gem-CR-stand/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc b/branches/gem-CR-stand/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc index f118bd384354f..1f5ad4f989e1a 100644 --- 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 index 3af036b9b4917..9da7787d49fbb 100644 --- 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 << "( "<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 " << "( "<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 < #include #include diff --git a/branches/gem-CR-stand/SimG4CMS/Forward/src/BscSD.cc b/branches/gem-CR-stand/SimG4CMS/Forward/src/BscSD.cc index 188409fc0033f..0382f08d38f6f 100644 --- 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 #include #include diff --git a/branches/gem-CR-stand/SimG4CMS/Forward/src/CastorSD.cc b/branches/gem-CR-stand/SimG4CMS/Forward/src/CastorSD.cc index 2979f50211a1e..ada2cfe928cfa 100644 --- 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 index 7c545437d0d78..5c0dcf971a4df 100644 --- 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 #include #include diff --git a/branches/gem-CR-stand/SimG4CMS/Forward/src/TotemSD.cc b/branches/gem-CR-stand/SimG4CMS/Forward/src/TotemSD.cc index 419934cdc3b8b..801782532e450 100644 --- 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 index a370851cd24ed..0418cca9110b5 100644 --- 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 index 3e4ae3bc17e7b..1436cb980ee03 100644 --- 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 index d3f07c057f377..fd4faa2c24de8 100644 --- 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 index 2d28e73f0400f..423462907861a 100644 --- 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 index f21a9047b4af9..124b48e2f5216 100644 --- 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 #include diff --git a/branches/gem-CR-stand/SimG4CMS/ShowerLibraryProducer/src/HFChamberSD.cc b/branches/gem-CR-stand/SimG4CMS/ShowerLibraryProducer/src/HFChamberSD.cc index 9ec3ff54b9d4e..070ccdae96528 100644 --- 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 index 3ada17507bd35..ae4f58e7167d2 100644 --- 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 index b6bbe232ccee2..f03edb6edcf18 100644 --- 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 index eec1eb7c556f5..8055d5bade2cc 100644 --- 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 index 863c59f425fdb..f5137be9e964b 100644 --- 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 #include #include diff --git a/branches/gem-CR-stand/SimG4CMS/Tracker/src/TrackerFrameRotation.cc b/branches/gem-CR-stand/SimG4CMS/Tracker/src/TrackerFrameRotation.cc index 7cc8dcf0985c5..44008ecc66098 100644 --- 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 index 9b32e755a4d48..99d9a2be5b328 100644 --- 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