Changeset 1340 for trunk/source/processes/hadronic/models/radioactive_decay

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/source/processes/hadronic/models/radioactive_decay

Files:

• History (modified) (1 diff)
• src/G4RadioactiveDecay.cc (modified) (4 diffs)
• src/G4RadioactiveDecaymessenger.cc (modified) (3 diffs)

trunk/source/processes/hadronic/models/radioactive_decay/History

@@ -15 +15 @@
      ----------------------------------------------------------
 
+11 Oct 2010 F. Lei (radioactive_decay-V09-03-01)
+
+- G4RadioactiveDecay.cc: apply SetICM(), SetARM() & SetHLThreshold() in all decay modes
+- G4RadioactiveDecay.cc:  halflifethreshold = 0.*second;
+- G4RadioactiveDecaymessenger.cc: removed (>0.) restrictions to hlCMD
+- G4RadioactiveDecaymessenger.cc: icmCMD,armCMD & hlCMD are available at PreInit state only. 
+
 26 May 2010 Dennis Wright (radioactive_decay-V09-03-00)
 -------------------------------------------------------
 tag HEAD to submit for testing
 
-11 may 2010 F.Lei
+11 May 2010 F.Lei
 - G4RadioactiveDecay.cc::LoadDecayTable:line 931 create a decaytable for isomers not included in RDM database and assume 
   they all under go IT decay.

trunk/source/processes/hadronic/models/radioactive_decay/src/G4RadioactiveDecay.cc

@@ -170 +170 @@
   applyICM    = true ;
   applyARM    = true ;
-  halflifethreshold = 1e-6*second;
+  halflifethreshold = 0.*second;
   //
   // RDM applies to xall logical volumes as default
@@ -772 +772 @@
                       G4BetaMinusDecayChannel (GetVerboseLevel(), &theParentNucleus,
                                                b, c*MeV, a*MeV, n, FBeta, aRandomEnergy);
+                    aBetaMinusChannel->SetICM(applyICM);
+                    aBetaMinusChannel->SetARM(applyARM);
+                    aBetaMinusChannel->SetHLThreshold(halflifethreshold);
                     theDecayTable->Insert(aBetaMinusChannel);
                     modeSumBR[1] += b;
@@ -816 +819 @@
                       G4BetaPlusDecayChannel (GetVerboseLevel(), &theParentNucleus,
                                               b, c*MeV, a*MeV, n, FBeta, aRandomEnergy);
+                    aBetaPlusChannel->SetICM(applyICM);
+                    aBetaPlusChannel->SetARM(applyARM);
+                    aBetaPlusChannel->SetHLThreshold(halflifethreshold);
                     theDecayTable->Insert(aBetaPlusChannel);
                     modeSumBR[2] += b;
@@ -891 +897 @@
                     G4AlphaDecayChannel (GetVerboseLevel(), &theParentNucleus,
                                          b, c*MeV, a*MeV);
+                  anAlphaChannel->SetICM(applyICM);
+                  anAlphaChannel->SetARM(applyARM);
+                  anAlphaChannel->SetHLThreshold(halflifethreshold);
                   theDecayTable->Insert(anAlphaChannel);
                   //          delete anAlphaChannel;

trunk/source/processes/hadronic/models/radioactive_decay/src/G4RadioactiveDecaymessenger.cc

@@ -123 +123 @@
   icmCmd->SetParameterName("applyICM",true);
   icmCmd->SetDefaultValue(true);
+  icmCmd->AvailableForStates(G4State_PreInit);
   //
   // Command contols whether ARM will be applied or not
@@ -130 +131 @@
   armCmd->SetParameterName("applyARM",true);
   armCmd->SetDefaultValue(true);
+  armCmd->AvailableForStates(G4State_PreInit);
   //
   // Command to set the h-l thresold for isomer production
@@ -136 +138 @@
   hlthCmd->SetGuidance("Set the h-l threshold for isomer production");
   hlthCmd->SetParameterName("hlThreshold",false);
-  hlthCmd->SetRange("hlThreshold>0.");
+  // hlthCmd->SetRange("hlThreshold>0.");
   hlthCmd->SetUnitCategory("Time");
-  hlthCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
+  hlthCmd->AvailableForStates(G4State_PreInit);
   //
   // Command to define the incident particle source time profile.