Changeset 961 for trunk/source/processes/decay/src

Timestamp:

Apr 6, 2009, 12:21:12 PM (15 years ago)

Author:

garnier

Message:

update processes

Location:

trunk/source/processes/decay/src

Files:

• G4Decay.cc (modified) (6 diffs)
• G4DecayWithSpin.cc (modified) (4 diffs)
• G4PionDecayMakeSpin.cc (modified) (1 diff)
• G4UnknownDecay.cc (modified) (3 diffs)

trunk/source/processes/decay/src/G4Decay.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4Decay.cc,v 1.27.2.1 2008/04/17 08:59:24 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4Decay.cc,v 1.30 2008/09/19 03:19:53 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 
@@ -64 +64 @@
                                 pExtDecayer(0)
 {
+  // set Process Sub Type
+  SetProcessSubType(static_cast<int>(DECAY));
+
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
@@ -69 +72 @@
   }
 #endif
+
   pParticleChange = &fParticleChangeForDecay;
 }
@@ -404 +408 @@
     fRemainderLifeTime = pTime - track.GetProperTime();
     if (fRemainderLifeTime <= 0.0) fRemainderLifeTime = DBL_MIN;
+    
     G4double  rvalue=0.0; 
     // use pre-assigned Decay time to determine PIL
     if (aLife>0.0) {
       // ordinary particle
-      rvalue = (fRemainderLifeTime/aLife)*GetMeanFreePath(track, previousStepSize
-, condition);
+      rvalue = (fRemainderLifeTime/aLife)*GetMeanFreePath(track, previousStepSize, condition);
     } else {
      // shortlived particle
@@ -418 +422 @@
     }
     return rvalue;
-  
   }
 }
@@ -440 +443 @@
   return fRemainderLifeTime;
 }
+
+
+void G4Decay::SetExtDecayer(G4VExtDecayer* val)
+{
+  pExtDecayer = val;
+
+  // set Process Sub Type
+  if ( pExtDecayer !=0 ) {
+    SetProcessSubType(static_cast<int>(DECAY_External));
+  }
+}

trunk/source/processes/decay/src/G4DecayWithSpin.cc

@@ -29 +29 @@
 //      History:
 //      17 August 2004  P. Gumplinger, T. MacPhail
+//      11 April  2008  Kamil Sedlak (PSI), Toni Shiroka (PSI)
 // ------------------------------------------------------------
 //
@@ -47 +48 @@
 #include "G4Transform3D.hh"
 
-G4DecayWithSpin::G4DecayWithSpin(const G4String& processName):G4Decay(processName){}
+G4DecayWithSpin::G4DecayWithSpin(const G4String& processName):G4Decay(processName)
+{
+  // set Process Sub Type   
+  SetProcessSubType(static_cast<int>(DECAY_WithSpin));
+
+}
 
 G4DecayWithSpin::~G4DecayWithSpin(){}
@@ -97 +103 @@
     if(fieldMgr)field = fieldMgr->GetDetectorField();
 
-    if (field && !(fieldMgr->DoesFieldChangeEnergy())) {
+    if (field) {
 
        G4double point[4];
@@ -105 +111 @@
        point[3] = aTrack.GetGlobalTime();
 
-       G4double fieldValue[3];
+       G4double fieldValue[6];
        field -> GetFieldValue(point,fieldValue);
 
        G4ThreeVector B(fieldValue[0],fieldValue[1],fieldValue[2]);
 
-       parent_polarization = Spin_Precession(aStep,B,fRemainderLifeTime);
+       // Call the spin precession only for non-zero mag. field
+       if (B.mag2() > 0.) parent_polarization = 
+                                 Spin_Precession(aStep,B,fRemainderLifeTime);
 
     }

trunk/source/processes/decay/src/G4PionDecayMakeSpin.cc

@@ -37 +37 @@
 
 G4PionDecayMakeSpin::G4PionDecayMakeSpin(const G4String& processName)
-                               : G4Decay(processName) { }
+                               : G4Decay(processName) 
+{
+  // set Process Sub Type
+  SetProcessSubType(static_cast<int>(DECAY_PionMakeSpin));
+
+}
 
 G4PionDecayMakeSpin::~G4PionDecayMakeSpin() { }

trunk/source/processes/decay/src/G4UnknownDecay.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4UnknownDecay.cc,v 1.5 2007/10/06 07:01:09 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4UnknownDecay.cc,v 1.6 2007/12/15 12:29:16 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 
@@ -40 +40 @@
 #include "G4PhysicsLogVector.hh"
 #include "G4ParticleChangeForDecay.hh"
+#include "G4DecayProcessType.hh"
+
 
 // constructor
@@ -47 +49 @@
                                 HighestValue(20.0)
 {
+  // set Process Sub Type
+  SetProcessSubType(static_cast<int>(DECAY_Unknown));
+
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {