slic/include

diff -u -r1.1 -r1.2
--- LCExtendedDecay.hh	4 Aug 2009 22:50:41 -0000	1.1
+++ LCExtendedDecay.hh	6 Aug 2009 20:03:25 -0000	1.2
@@ -15,7 +15,7 @@

             G4bool IsApplicable( const G4ParticleDefinition &pdef )
             {
                 return ( pdef.GetParticleType() == "extended" );

-            }            

+            }                        

     };
 }
 

slic/include

diff -u -r1.1 -r1.2
--- LCExtendedParticles.hh	4 Aug 2009 22:50:41 -0000	1.1
+++ LCExtendedParticles.hh	6 Aug 2009 20:03:25 -0000	1.2
@@ -6,6 +6,7 @@

 
 // geant4
 #include "G4VPhysicsConstructor.hh"

+#include "G4Decay.hh"

 
 namespace slic
 {

@@ -23,8 +24,8 @@

 
         private:
 

-            LCExtendedDecay m_decay;
-

+            //LCExtendedDecay m_decay;
+            G4Decay m_decay;

     };
 }
 

slic/include

diff -u -r1.19 -r1.20
--- PhysicsListManager.hh	4 Aug 2009 22:50:41 -0000	1.19
+++ PhysicsListManager.hh	6 Aug 2009 20:03:25 -0000	1.20
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/include/PhysicsListManager.hh,v 1.19 2009/08/04 22:50:41 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/PhysicsListManager.hh,v 1.20 2009/08/06 20:03:25 jeremy Exp $

 
 #ifndef SLIC_PHYSICSLISTMANAGER_HH
 #define SLIC_PHYSICSLISTMANAGER_HH 1

@@ -14,6 +14,7 @@

 // geant4
 #include "G4VUserPhysicsList.hh"
 #include "G4RunManager.hh"

+#include "G4Decay.hh"

 
 // std
 #include <string>

slic/src

diff -u -r1.1 -r1.2
--- LCExtendedParticles.cc	4 Aug 2009 22:50:42 -0000	1.1
+++ LCExtendedParticles.cc	6 Aug 2009 20:03:26 -0000	1.2
@@ -32,10 +32,13 @@

             // Check for a built-in definition of this particle.
             G4ParticleDefinition* pdef = G4ParticleTable::GetParticleTable()->FindParticle( pdata.pid() );
 

-            // Add non-SUSY particles that Geant4 does not already know about.  
-            // SUSY particles are instead added by LCSUSYPhysics.
-            if ( !id.isSUSY() && pdef == 0) 
-            {                

+            // Add particles that Geant4 does not already know about.  
+            if ( pdef == 0) 
+            {  
+                G4String name = "extended";
+                if ( id.isSUSY() )
+                    name = "susy";
+              

                 // Create a G4ParticleDefinition for this SUSY particle.
                 G4ParticleDefinition *pdef = 
                     new G4ParticleDefinition(

@@ -70,8 +73,9 @@

         {
             G4ParticleDefinition* pdef = theParticleIterator->value();
             G4ProcessManager* pmgr = pdef->GetProcessManager();

-            if ( m_decay.IsApplicable( *pdef ) )

+            if ( pdef->GetParticleType() == "extended" || pdef->GetParticleType() == "susy" )

             {

+                //G4cout << "adding decay to " << pdef->GetParticleName() << G4endl;

                 pmgr->AddProcess( &m_decay, -1, -1, 1 );
             }
         }

slic/src

diff -u -r1.22 -r1.23
--- PhysicsListManager.cc	5 Aug 2009 21:16:20 -0000	1.22
+++ PhysicsListManager.cc	6 Aug 2009 20:03:26 -0000	1.23
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.22 2009/08/05 21:16:20 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.23 2009/08/06 20:03:26 jeremy Exp $

 #include "PhysicsListManager.hh"
 
 // geant4

@@ -69,7 +69,7 @@

             m_currentList = PhysicsListFactory::instance()->create( m_currentListName );
 
             // Support for SUSY particles from PDT table.

-            setupSUSY();

+            //setupSUSY();

 
             // Support for extended set of SM particles from PDT which Geant4 does not know about.
             setupExtended();