---

yaml --- r: 32767 b: "refs/heads/CMSSW_7_1_X" c: f419157 h: "refs/heads/CMSSW_7_1_X" i: 32765: 76c8718 32763: add24ff 32759: 25d2fd6 32751: e4adba5 32735: d39535c 32703: 99745c6 32639: 7eaee43 32511: 9e48586 32255: 9811f4e 31743: 4d58880 30719: 367d9a2 28671: c01b2cd 24575: 9be5321 16383: 7207857 v: v3
cms-sw · Oct 24, 2007 · 9a06617 · 9a06617
1 parent 1c79403
commit 9a06617
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": dc912b0feccbac254fc784cbc380e9394b29d26e
+"refs/heads/CMSSW_7_1_X": f419157f2e184221dca1ae95d9432df611c4e2a6
diff --git a/trunk/SimG4Core/PhysicsLists/interface/EmStandardPhysics52.hh b/trunk/SimG4Core/PhysicsLists/interface/EmStandardPhysics52.hh
@@ -1,6 +1,7 @@
 #ifndef SimG4Core_PhysicsLists_EmStandardPhysics52_h
 #define SimG4Core_PhysicsLists_EmStandardPhysics52_h 1
-
+#include "SimG4Core/PhysicsLists/interface/G4Version.h"
+#ifndef G4V9
 #include "G4VPhysicsConstructor.hh"
 #include "globals.hh"
 
@@ -21,7 +22,7 @@ private:
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
+#endif
 #endif
 
 

diff --git a/trunk/SimG4Core/PhysicsLists/interface/G4Version.h b/trunk/SimG4Core/PhysicsLists/interface/G4Version.h
@@ -0,0 +1 @@
+#define G4V8
diff --git a/trunk/SimG4Core/PhysicsLists/plugins/FTFPCMS.cc b/trunk/SimG4Core/PhysicsLists/plugins/FTFPCMS.cc
@@ -1,3 +1,4 @@
+#include "SimG4Core/PhysicsLists/interface/G4Version.h"
 #include "FTFPCMS.hh"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -27,7 +28,11 @@ FTFPCMS::FTFPCMS(G4LogicalVolumeToDDLogicalPartMap& map,
 
   if (emPhys) {
     // EM Physics
+#ifndef G4V9
     RegisterPhysics( new G4EmStandardPhysics("standard EM",ver));
+#else
+    RegisterPhysics( new G4EmStandardPhysics(ver,"standard EM"));
+#endif
 
     // Synchroton Radiation & GN Physics
     RegisterPhysics( new G4EmExtraPhysics("extra EM"));

diff --git a/trunk/SimG4Core/PhysicsLists/plugins/LHEPCMS.cc b/trunk/SimG4Core/PhysicsLists/plugins/LHEPCMS.cc
@@ -1,3 +1,4 @@
+#include "SimG4Core/PhysicsLists/interface/G4Version.h"
 #include "LHEPCMS.hh"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -25,7 +26,11 @@ LHEPCMS::LHEPCMS(G4LogicalVolumeToDDLogicalPartMap& map,
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new G4EmStandardPhysics("standard EM", ver));
+#ifndef G4V9
+    RegisterPhysics( new G4EmStandardPhysics("standard EM",ver));
+#else
+    RegisterPhysics( new G4EmStandardPhysics(ver,"standard EM"));
+#endif
 
     // Synchroton Radiation & GN Physics
     RegisterPhysics( new G4EmExtraPhysics("extra EM"));

diff --git a/trunk/SimG4Core/PhysicsLists/plugins/QGSCCMS.cc b/trunk/SimG4Core/PhysicsLists/plugins/QGSCCMS.cc
@@ -1,3 +1,4 @@
+#include "SimG4Core/PhysicsLists/interface/G4Version.h"
 #include "QGSCCMS.hh"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -27,7 +28,11 @@ QGSCCMS::QGSCCMS(G4LogicalVolumeToDDLogicalPartMap& map,
 
   if (emPhys) {
     // EM Physics
+#ifndef G4V9
     RegisterPhysics( new G4EmStandardPhysics("standard EM",ver));
+#else
+    RegisterPhysics( new G4EmStandardPhysics(ver,"standard EM"));
+#endif
 
     // Synchroton Radiation & GN Physics
     RegisterPhysics( new G4EmExtraPhysics("extra EM"));

diff --git a/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS.cc b/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS.cc
@@ -1,3 +1,4 @@
+#include "SimG4Core/PhysicsLists/interface/G4Version.h"
 #include "QGSPCMS.hh"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -27,7 +28,11 @@ QGSPCMS::QGSPCMS(G4LogicalVolumeToDDLogicalPartMap& map,
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics(new G4EmStandardPhysics("standard EM",ver));
+#ifndef G4V9
+    RegisterPhysics( new G4EmStandardPhysics("standard EM",ver));
+#else
+    RegisterPhysics( new G4EmStandardPhysics(ver,"standard EM"));
+#endif
 
     // Synchroton Radiation & GN Physics
     RegisterPhysics(new G4EmExtraPhysics("extra EM"));

diff --git a/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT.cc b/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT.cc
@@ -1,3 +1,4 @@
+#include "SimG4Core/PhysicsLists/interface/G4Version.h"
 #include "QGSPCMS_BERT.hh"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -27,7 +28,11 @@ QGSPCMS_BERT::QGSPCMS_BERT(G4LogicalVolumeToDDLogicalPartMap& map,
 
   if (emPhys) {
     // EM Physics
+#ifndef G4V9
     RegisterPhysics( new G4EmStandardPhysics("standard EM",ver));
+#else
+    RegisterPhysics( new G4EmStandardPhysics(ver,"standard EM"));
+#endif
 
     // Synchroton Radiation & GN Physics
     RegisterPhysics( new G4EmExtraPhysics("extra EM"));

diff --git a/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_HP.cc b/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_HP.cc
@@ -1,3 +1,4 @@
+#include "SimG4Core/PhysicsLists/interface/G4Version.h"
 #include "QGSPCMS_BERT_HP.hh"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -23,7 +24,11 @@ QGSPCMS_BERT_HP::QGSPCMS_BERT_HP(G4LogicalVolumeToDDLogicalPartMap& map,
 
   if (emPhys) {
     // EM Physics
+#ifndef G4V9
     RegisterPhysics( new G4EmStandardPhysics("standard EM",ver));
+#else
+    RegisterPhysics( new G4EmStandardPhysics(ver,"standard EM"));
+#endif
 
     // Synchroton Radiation & GN Physics
     RegisterPhysics( new G4EmExtraPhysics("extra EM"));

diff --git a/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS_EMV.cc b/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS_EMV.cc
@@ -1,8 +1,13 @@
+#include "SimG4Core/PhysicsLists/interface/G4Version.h"
 #include "QGSPCMS_EMV.hh"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "G4DecayPhysics.hh"
+#ifndef G4V9
 #include "G4EmStandardPhysics71.hh"
+#else
+#include "G4EmStandardPhysics_option1.hh"
+#endif
 #include "G4EmExtraPhysics.hh"
 #include "G4IonPhysics.hh"
 #include "G4QStoppingPhysics.hh"
@@ -27,7 +32,11 @@ QGSPCMS_EMV::QGSPCMS_EMV(G4LogicalVolumeToDDLogicalPartMap& map,
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics(new G4EmStandardPhysics71("standard EM v71",ver));
+#ifndef G4V9
+    RegisterPhysics( new G4EmStandardPhysics71("standard EM v71",ver));
+#else
+    RegisterPhysics( new G4EmStandardPhysics_option1(ver,"standard EM_opt1"));
+#endif
 
     // Synchroton Radiation & GN Physics
     RegisterPhysics(new G4EmExtraPhysics("extra EM"));

diff --git a/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS_G4v52.cc b/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS_G4v52.cc
@@ -1,4 +1,5 @@
 #include "QGSPCMS_G4v52.hh"
+#ifndef G4V9
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimG4Core/PhysicsLists/interface/EmStandardPhysics52.hh"
 
@@ -52,3 +53,4 @@ QGSPCMS_G4v52::QGSPCMS_G4v52(G4LogicalVolumeToDDLogicalPartMap& map,
     RegisterPhysics( new G4NeutronTrackingCut("Neutron tracking cut", ver));
   }
 }
+#endif
diff --git a/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS_G4v52.hh b/trunk/SimG4Core/PhysicsLists/plugins/QGSPCMS_G4v52.hh
@@ -1,5 +1,7 @@
 #ifndef SimG4Core_PhysicsLists_QGSPCMS_G4v52_H
 #define SimG4Core_PhysicsLists_QGSPCMS_G4v52_H
+#include "SimG4Core/PhysicsLists/interface/G4Version.h"
+#ifndef G4V9
 
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -12,5 +14,6 @@ public:
 };
 
 #endif
+#endif
 
 
diff --git a/trunk/SimG4Core/PhysicsLists/plugins/module.cc b/trunk/SimG4Core/PhysicsLists/plugins/module.cc
@@ -1,3 +1,4 @@
+#include "SimG4Core/PhysicsLists/interface/G4Version.h"
 #include "SimG4Core/Physics/interface/PhysicsListFactory.h"
 
 #include "DummyPhysics.hh"
@@ -6,7 +7,9 @@
 #include "QGSCCMS.hh"
 #include "QGSPCMS.hh"
 #include "QGSPCMS_EMV.hh"
+#ifndef G4V9
 #include "QGSPCMS_G4v52.hh"
+#endif
 #include "QGSPCMS_BERT.hh"
 #include "QGSPCMS_BERT_HP.hh"
 
@@ -21,8 +24,10 @@ typedef QGSPCMS QGSP;
 DEFINE_PHYSICSLIST(QGSP);
 typedef QGSPCMS_EMV QGSP_EMV;
 DEFINE_PHYSICSLIST(QGSP_EMV);
+#ifndef G4V9
 typedef QGSPCMS_G4v52 QGSP_G4v52;
 DEFINE_PHYSICSLIST(QGSP_G4v52);
+#endif
 typedef QGSPCMS_BERT QGSP_BERT;
 DEFINE_PHYSICSLIST(QGSP_BERT);
 typedef QGSPCMS_BERT_HP QGSP_BERT_HP;

diff --git a/trunk/SimG4Core/PhysicsLists/src/EmStandardPhysics52.cc b/trunk/SimG4Core/PhysicsLists/src/EmStandardPhysics52.cc
@@ -1,5 +1,5 @@
 #include "SimG4Core/PhysicsLists/interface/EmStandardPhysics52.hh"
-
+#ifndef G4V9
 #include "G4ParticleDefinition.hh"
 #include "G4ProcessManager.hh"
 #include "G4LossTableManager.hh"
@@ -156,4 +156,4 @@ void EmStandardPhysics52::ConstructProcess()
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
+#endif