slic
diff -u -r1.37 -r1.38
--- GNUmakefile 15 Oct 2007 23:52:37 -0000 1.37
+++ GNUmakefile 15 Dec 2007 01:39:55 -0000 1.38
@@ -1,4 +1,4 @@
-# $Header: /cvs/lcd/slic/GNUmakefile,v 1.37 2007/10/15 23:52:37 jeremy Exp $
+# $Header: /cvs/lcd/slic/GNUmakefile,v 1.38 2007/12/15 01:39:55 jeremy Exp $
#
# Makefile for SLIC simulation package based on examples GNUmakefile by G. Cosmo.
#
@@ -28,6 +28,12 @@
CPPFLAGS += $(SLIC_CXXFLAGS)
CPPFLAGS += $(SLIC_DEFS)
+# add Geant4 versioning
+# FIXME: DOES NOT BELONG HERE.
+CPPFLAGS += -DGEANT4_MAJOR_VERSION=$(GEANT4_MAJOR_VERSION)
+CPPFLAGS += -DGEANT4_MINOR_VERSION=$(GEANT4_MINOR_VERSION)
+CPPFLAGS += -DGEANT4_PATCH_VERSION=$(GEANT4_PATCH_VERSION)
+
# SLIC make includes (gmk) dir
MAKEINCLUDES := $(SLIC_BASE)/config/make
slic/src
diff -u -r1.2 -r1.3
--- LCOpticalPhysics.cc 15 Dec 2007 01:32:16 -0000 1.2
+++ LCOpticalPhysics.cc 15 Dec 2007 01:39:55 -0000 1.3
@@ -78,13 +78,10 @@
G4String particleName = particle->GetParticleName();
if (theCerenkovProcess->IsApplicable(*particle))
{
- //G4cout << "G4 major: " << GEANT4_MAJOR_VERSION << G4endl;
- //G4cout << "G4 minor: " << GEANT4_MINOR_VERSION << G4endl;
-
-#if (GEANT4_MAJOR >= 9 && GEANT4_MINOR >= 1)
+#if (GEANT4_MAJOR_VERSION >= 9) && (GEANT4_MINOR_VERSION >= 1)
// Changed to a post-step process in G4 9.1.
pmanager->AddProcess(theCerenkovProcess);
- pmanager->SetProcessOrdering(theCerenkovProcess,pmanager->GetProcessListLength()-1);
+ pmanager->SetProcessOrderingToLast(theCerenkovProcess, idxPostStep);
#else
pmanager->AddContinuousProcess(theCerenkovProcess);
#endif