projects/slic/trunk/src

--- projects/slic/trunk/src/LCExtendedParticles.cc	2014-08-19 06:02:03 UTC (rev 3275)
+++ projects/slic/trunk/src/LCExtendedParticles.cc	2014-08-19 19:19:02 UTC (rev 3276)
@@ -72,7 +72,7 @@

 
 void LCExtendedParticles::ConstructProcess() {
 

-#if ( G4VERSION_NUMBER < 960 )

+#if ( G4VERSION_NUMBER < 1000 )

 	G4ParticleTable::G4PTblDicIterator* aParticleIterator = G4ParticleTable::GetParticleTable()->GetIterator();
 #endif
 	aParticleIterator->reset();

projects/slic/trunk/src

--- projects/slic/trunk/src/LCOpticalPhysics.cc	2014-08-19 06:02:03 UTC (rev 3275)
+++ projects/slic/trunk/src/LCOpticalPhysics.cc	2014-08-19 19:19:02 UTC (rev 3276)
@@ -29,7 +29,7 @@

 	theCerenkovProcess->SetMaxNumPhotonsPerStep(300);
 	theScintillationProcess->SetScintillationYieldFactor(1.);
 

-#if ( G4VERSION_NUMBER < 960 )

+#if ( G4VERSION_NUMBER < 1000 )

 	G4ParticleTable::G4PTblDicIterator* aParticleIterator = G4ParticleTable::GetParticleTable()->GetIterator();
 #endif
 	aParticleIterator->reset();

projects/slic/trunk/src

--- projects/slic/trunk/src/LCSUSYPhysics.cc	2014-08-19 06:02:03 UTC (rev 3275)
+++ projects/slic/trunk/src/LCSUSYPhysics.cc	2014-08-19 19:19:02 UTC (rev 3276)
@@ -58,7 +58,7 @@

 
 void LCSUSYPhysics::ConstructProcess() {
 

-#if ( G4VERSION_NUMBER < 960 )

+#if ( G4VERSION_NUMBER < 1000 )

 	G4ParticleTable::G4PTblDicIterator* aParticleIterator = G4ParticleTable::GetParticleTable()->GetIterator();
 #endif
 	aParticleIterator->reset();

projects/slic/trunk/src

--- projects/slic/trunk/src/LcioManager.cc	2014-08-19 06:02:03 UTC (rev 3275)
+++ projects/slic/trunk/src/LcioManager.cc	2014-08-19 19:19:02 UTC (rev 3276)
@@ -198,7 +198,12 @@

 void LcioManager::beginRun(const G4Run* aRun) {
 
 	// Set the G4Run counter.

+#if ( G4VERSION_NUMBER >= 1000 )

     G4RunManager::GetRunManager()->GetNonConstCurrentRun()->SetRunID(m_runNumber);

+#else
+    // Alternate code for backward compatibility.
+    const_cast<G4Run*>(G4RunManager::GetRunManager()->GetCurrentRun())->SetRunID(m_runNumber);
+#endif

 
     // Automatically create LCIO output file name if option was selected.
     if (m_usingAutoname) {