Print

Print


Commit in slic/src on MAIN
LCExtendedParticles.cc+25-261.3 -> 1.4
LCSUSYPhysics.cc+20-211.4 -> 1.5
+45-47
2 modified files
fix compile warnings; do NOT enable MS for extended particles that Geant4 doesn't know about (for now)

slic/src
LCExtendedParticles.cc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- LCExtendedParticles.cc	18 Aug 2009 23:14:32 -0000	1.3
+++ LCExtendedParticles.cc	8 Dec 2009 01:06:13 -0000	1.4
@@ -40,30 +40,28 @@
                     name = "susy";
               
                 // Create a G4ParticleDefinition for this SUSY particle.
-                G4ParticleDefinition *pdef = 
-                    new G4ParticleDefinition(
-                        pdata.PDTname(),               // name 
-                        pdata.mass().value() * GeV,    // mass
-                        pdata.totalWidth().value(),    // width
-                        pdata.charge(),                // charge
-                        0,                             // 2*spin
-                        0,                             // parity
-                        0,                             // C-conjugation
-                        0,                             // 2*isospin
-                        0,                             // 2*isospin3
-                        0,                             // G-parity
-                        "extended",                    // type
-                        0,                             // lepton number
-                        0,                             // baryon number
-                        pdata.pid(),                   // PDG encoding
-                        false,                         // stable 
-                        1e30,                          // lifetime (DEBUG)
-                        0,                             // decay table
-                        false                          // short lived
-                        );                               
+                new G4ParticleDefinition(
+                    pdata.PDTname(),               // name 
+                    pdata.mass().value() * GeV,    // mass
+                    pdata.totalWidth().value(),    // width
+                    pdata.charge(),                // charge
+                    0,                             // 2*spin
+                    0,                             // parity
+                    0,                             // C-conjugation
+                    0,                             // 2*isospin
+                    0,                             // 2*isospin3
+                    0,                             // G-parity
+                    "extended",                    // type
+                    0,                             // lepton number
+                    0,                             // baryon number
+                    pdata.pid(),                   // PDG encoding
+                    false,                         // stable 
+                    1e30,                          // lifetime (DEBUG)
+                    0,                             // decay table
+                    false                          // short lived
+                    );                               
             }
-        }
-
+        }       
     }
     
     void LCExtendedParticles::ConstructProcess()
@@ -77,9 +75,10 @@
             {
                 if (pdef->GetPDGCharge() != 0) 
                 {
-                    pmgr->AddProcess( &m_scatter, -1,  1, 1);  // multiple scattering (must go first)
-                    pmgr->AddProcess( &m_ionise,  -1,  2, 2 ); // ionisation
-                    pmgr->AddProcess( &m_decay,   -1, -1, 3 ); // decay 
+                    // Don't think we want MS on unknown particles for now!  
+                    // pmgr->AddProcess( &m_scatter, -1,  1, 1);  // multiple scattering (must go first)
+                    pmgr->AddProcess( &m_ionise,  -1,  1, 1 ); // ionisation
+                    pmgr->AddProcess( &m_decay,   -1, -1, 2 ); // decay 
                 }
                 else {
                     pmgr->AddProcess( &m_decay,   -1, -1, 1 ); // decay 

slic/src
LCSUSYPhysics.cc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- LCSUSYPhysics.cc	4 Aug 2009 22:50:42 -0000	1.4
+++ LCSUSYPhysics.cc	8 Dec 2009 01:06:13 -0000	1.5
@@ -35,27 +35,26 @@
             if ( id.isSUSY() ) 
             {
                 // Create a G4ParticleDefinition for this SUSY particle.
-                G4ParticleDefinition *pdef = 
-                    new G4ParticleDefinition(
-                        pdata.PDTname(),               // name 
-                        pdata.mass().value() * GeV,    // mass
-                        pdata.totalWidth().value(),    // width
-                        pdata.charge(),                // charge
-                        0,                             // 2*spin
-                        0,                             // parity
-                        0,                             // C-conjugation
-                        0,                             // 2*isospin
-                        0,                             // 2*isospin3
-                        0,                             // G-parity
-                        "susy",                        // type
-                        0,                             // lepton number
-                        0,                             // baryon number
-                        pdata.pid(),                   // PDG encoding
-                        false,                         // stable 
-                        1e30,                          // lifetime (DEBUG)
-                        0,                             // decay table
-                        false                          // short lived
-                        );                               
+                new G4ParticleDefinition(
+                    pdata.PDTname(),               // name 
+                    pdata.mass().value() * GeV,    // mass
+                    pdata.totalWidth().value(),    // width
+                    pdata.charge(),                // charge
+                    0,                             // 2*spin
+                    0,                             // parity
+                    0,                             // C-conjugation
+                    0,                             // 2*isospin
+                    0,                             // 2*isospin3
+                    0,                             // G-parity
+                    "susy",                        // type
+                    0,                             // lepton number
+                    0,                             // baryon number
+                    pdata.pid(),                   // PDG encoding
+                    false,                         // stable 
+                    1e30,                          // lifetime (DEBUG)
+                    0,                             // decay table
+                    false                          // short lived
+                    );                               
             }
         }
     }
CVSspam 0.2.8