Ignore:
Timestamp:
Apr 6, 2009, 12:34:39 PM (17 years ago)
Author:
garnier
Message:

update processes

Location:
trunk/source/processes/management
Files:
43 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/management/History

    r819 r963  
    1 $Id: History,v 1.51.2.1.2.1 2008/04/25 11:47:06 kurasige Exp $
     1$Id: History,v 1.58 2008/06/23 08:58:40 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
    19 - Apr. 25, 2008   H.Kurashige (procman-V09-00-06)
     19
     20- Jun. 23, 2008   G.Cosmo (procman-V09-01-03)
     21- Fixed un-necessary double deletion/creation of vector in
     22  G4ProcessVector::operator=()
     23
     24- Mar. 20, 2008   H.Kurashige (procman-V09-01-02)
     25- revert changes in G4processmanager::StartTracking
     26
     27- Mar. 14, 2008   H.Kurashige (procman-V09-01-01)
     28- fix warning message of g++
     29- Change order of invocation of processes in G4processmanager::StartTracking
     30
     31- Dec. 15, 2007   H.Kurashige (procman-V09-01-00)
    2032- fixed a bug of invoking ResetNumberOfInteractionLengthLeft
    2133  at the zero length step 
    2234- allow zero mean free path for PostStepDoIt
    23 
     35- add ProcessSubType to G4VProcess
    2436
    2537- Dec. 12, 2007   G.Cosmo (procman-V09-00-05a)
    2638- Moved inline definitions of virtual methods in G4WrapperProcess to
    27   .cc file.
     39  .cc file. Included in tag "procman-V09-00-".
    2840
    2941- Nov. 28, 2007   H.Kurashige (procman-V09-00-05)

  • trunk/source/processes/management/include/G4IVContinuousDiscreteProcess.hh

    r819 r963  
    2626//
    2727// $Id: G4IVContinuousDiscreteProcess.hh,v 1.8 2006/06/29 21:07:14 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// $Id:

  • trunk/source/processes/management/include/G4IVRestDiscreteProcess.hh

    r819 r963  
    2626//
    2727// $Id: G4IVRestDiscreteProcess.hh,v 1.8 2006/06/29 21:07:16 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// $Id:

  • trunk/source/processes/management/include/G4ParticleTypes.hh

    r819 r963  
    2626//
    2727// $Id: G4ParticleTypes.hh,v 1.6 2006/06/29 21:07:18 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4ProcTblElement.hh

    r819 r963  
    2626//
    2727// $Id: G4ProcTblElement.hh,v 1.11 2006/06/29 21:07:20 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4ProcTblElement.icc

    r819 r963  
    2626//
    2727// $Id: G4ProcTblElement.icc,v 1.8 2006/06/29 21:07:22 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4ProcessAttribute.hh

    r819 r963  
    2626//
    2727// $Id: G4ProcessAttribute.hh,v 1.5 2006/06/29 21:07:24 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4ProcessManager.hh

    r819 r963  
    2626//
    2727// $Id: G4ProcessManager.hh,v 1.16 2007/10/02 08:23:20 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4ProcessManager.icc

    r819 r963  
    2626//
    2727// $Id: G4ProcessManager.icc,v 1.6 2007/03/30 01:02:28 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4ProcessManagerMessenger.hh

    r819 r963  
    2626//
    2727// $Id: G4ProcessManagerMessenger.hh,v 1.7 2006/06/29 21:07:30 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4ProcessTable.hh

    r819 r963  
    2727//
    2828// $Id: G4ProcessTable.hh,v 1.10 2006/06/29 21:07:32 gunter Exp $
    29 // GEANT4 tag $Name: $
     29// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3030//
    3131//

  • trunk/source/processes/management/include/G4ProcessTable.icc

    r819 r963  
    2626//
    2727// $Id: G4ProcessTable.icc,v 1.5 2006/06/29 21:07:34 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//  History:

  • trunk/source/processes/management/include/G4ProcessTableMessenger.hh

    r819 r963  
    2626//
    2727// $Id: G4ProcessTableMessenger.hh,v 1.7 2006/06/29 21:07:36 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4ProcessType.hh

    r819 r963  
    2626//
    2727// $Id: G4ProcessType.hh,v 1.5 2006/06/29 21:07:38 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4ProcessVector.hh

    r819 r963  
    2626//
    2727// $Id: G4ProcessVector.hh,v 1.10 2006/06/29 21:07:40 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4ProcessVector.icc

    r819 r963  
    2626//
    2727// $Id: G4ProcessVector.icc,v 1.5 2006/06/29 21:07:42 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030inline G4bool G4ProcessVector::operator==(const G4ProcessVector &right) const

  • trunk/source/processes/management/include/G4VContinuousDiscreteProcess.hh

    r819 r963  
    2525//
    2626//
    27 // $Id: G4VContinuousDiscreteProcess.hh,v 1.8.4.1 2008/04/25 11:47:06 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4VContinuousDiscreteProcess.hh,v 1.9 2007/11/15 04:10:18 kurasige Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4VContinuousProcess.hh

    r819 r963  
    2626//
    2727// $Id: G4VContinuousProcess.hh,v 1.6 2006/06/29 21:07:46 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4VDiscreteProcess.hh

    r819 r963  
    2626
    2727//
    28 // $Id: G4VDiscreteProcess.hh,v 1.8.4.1 2008/04/25 11:47:06 kurasige Exp $
    29 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     28// $Id: G4VDiscreteProcess.hh,v 1.9 2007/11/15 04:10:18 kurasige Exp $
     29// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3030//
    3131//

  • trunk/source/processes/management/include/G4VProcess.hh

    r819 r963  
    2525//
    2626//
    27 // $Id: G4VProcess.hh,v 1.24 2007/10/02 08:23:20 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4VProcess.hh,v 1.25 2007/11/15 04:09:58 kurasige Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
    … …  
    5353//   Added PreparePhysicsTable  20 Aug. 2004 H.Kurashige
    5454//   Added isXXXXDoItIsEnabled   2 Oct. 2007 H.Kurashige
     55//   Added ProcessSubType   15 Nov. 2007 H.Kurashige
    5556
    5657#ifndef G4VProcess_h
    … …  
    261262      //  Set the process type.
    262263
     264      G4int GetProcessSubType() const;
     265      //  Returns the process sub type.
     266
     267      void SetProcessSubType(G4int );
     268      //  Set the process sub type.
     269
    263270      static const G4String& GetProcessTypeName(G4ProcessType );
    264271      //  Returns the process type name
    … …  
    329336      //  The type of the process
    330337
     338      G4int theProcessSubType;
     339      //  The sub type of the process
     340
    331341      G4double thePILfactor;
    332342      // factor for PhysicsInteractionLength
    … …  
    379389}
    380390
     391inline
     392 G4int G4VProcess::GetProcessSubType() const
     393{
     394  return theProcessSubType;
     395}
     396
     397inline
     398 void G4VProcess::SetProcessSubType(G4int value)
     399{
     400 theProcessSubType = value;
     401}
     402
    381403inline  void G4VProcess::SetVerboseLevel(G4int value)
    382404{

  • trunk/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh

    r819 r963  
    2525//
    2626//
    27 // $Id: G4VRestContinuousDiscreteProcess.hh,v 1.8.4.1 2008/04/25 11:47:06 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4VRestContinuousDiscreteProcess.hh,v 1.9 2007/11/15 04:10:18 kurasige Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4VRestContinuousProcess.hh

    r819 r963  
    2626//
    2727// $Id: G4VRestContinuousProcess.hh,v 1.6 2006/06/29 21:07:54 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4VRestDiscreteProcess.hh

    r819 r963  
    2525//
    2626//
    27 // $Id: G4VRestDiscreteProcess.hh,v 1.8.4.1 2008/04/25 11:47:07 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4VRestDiscreteProcess.hh,v 1.9 2007/11/15 04:10:18 kurasige Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4VRestProcess.hh

    r819 r963  
    2626//
    2727// $Id: G4VRestProcess.hh,v 1.6 2006/06/29 21:07:58 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/include/G4WrapperProcess.hh

    r819 r963  
    2626//
    2727// $Id: G4WrapperProcess.hh,v 1.9 2007/12/12 10:09:49 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4IVContinuousDiscreteProcess.cc

    r819 r963  
    2525//
    2626//
    27 // $Id: G4IVContinuousDiscreteProcess.cc,v 1.9.4.1 2008/04/25 11:47:07 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4IVContinuousDiscreteProcess.cc,v 1.10 2007/11/15 04:10:18 kurasige Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// $Id:

  • trunk/source/processes/management/src/G4IVRestDiscreteProcess.cc

    r819 r963  
    2525//
    2626//
    27 // $Id: G4IVRestDiscreteProcess.cc,v 1.9.4.1 2008/04/25 11:47:07 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4IVRestDiscreteProcess.cc,v 1.10 2007/11/15 04:10:18 kurasige Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// $Id:

  • trunk/source/processes/management/src/G4ProcTblElement.cc

    r819 r963  
    2626//
    2727// $Id: G4ProcTblElement.cc,v 1.7 2006/06/29 21:08:06 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4ProcessAttribute.cc

    r819 r963  
    2626//
    2727// $Id: G4ProcessAttribute.cc,v 1.5 2006/06/29 21:08:08 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4ProcessManager.cc

    r819 r963  
    2525//
    2626//
    27 // $Id: G4ProcessManager.cc,v 1.34 2007/11/28 17:47:57 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4ProcessManager.cc,v 1.36 2008/03/20 02:57:09 kurasige Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4ProcessManagerMessenger.cc

    r819 r963  
    2626//
    2727// $Id: G4ProcessManagerMessenger.cc,v 1.10 2006/06/29 21:08:12 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4ProcessTable.cc

    r819 r963  
    2626//
    2727// $Id: G4ProcessTable.cc,v 1.13 2007/10/06 05:33:58 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4ProcessTableMessenger.cc

    r819 r963  
    2525//
    2626//
    27 // $Id: G4ProcessTableMessenger.cc,v 1.17 2006/06/29 21:08:16 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4ProcessTableMessenger.cc,v 1.18 2008/03/14 02:55:04 kurasige Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
    … …  
    438438  for (idx = 0; idx < 1000 ; idx ++ ) {
    439439    G4String typeName = G4VProcess::GetProcessTypeName(G4ProcessType(idx));
    440     if ( isFoundEndMark = typeName.contains("---")) break;
     440    isFoundEndMark = typeName.contains("---");
     441    if ( isFoundEndMark ) break;
    441442  }
    442443  if ( isFoundEndMark ) {

  • trunk/source/processes/management/src/G4ProcessVector.cc

    r819 r963  
    2525//
    2626//
    27 // $Id: G4ProcessVector.cc,v 1.4 2006/06/29 21:08:18 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4ProcessVector.cc,v 1.5 2008/06/23 08:58:26 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
    … …  
    3838#include "G4ProcessVector.hh"
    3939
    40 
    4140/////// Constructors
    42 G4ProcessVector::G4ProcessVector(size_t):pProcVector(0)
     41//
     42G4ProcessVector::G4ProcessVector(size_t)
    4343{
    44    pProcVector = new G4ProcVector();
     44  pProcVector = new G4ProcVector();
    4545}
    4646
    … …  
    5151
    5252/////// destructor
     53//
    5354G4ProcessVector::~G4ProcessVector()
    5455{
    5556  // delete pProcVector
    56   if (pProcVector != 0 ) {
     57  //
     58  if (pProcVector != 0 )
     59  {
    5760    pProcVector->clear();
    5861    delete pProcVector;
    … …  
    6164
    6265////// assignment oeprator
     66//
    6367G4ProcessVector & G4ProcessVector::operator=(G4ProcessVector &right)
    6468{
    65   if (this != &right) {
     69  if (this != &right)
     70  {
    6671    // delete pProcVector
    67     if (pProcVector != 0 ) {
     72    //
     73    if (pProcVector != 0 )
     74    {
    6875      pProcVector->clear();
    6976      delete pProcVector;
    … …  
    7380   
    7481    // copy all contents in  pProcVector
    75     if (pProcVector != 0) {
    76       pProcVector->clear();
    77       delete pProcVector;
    78     }
    79     pProcVector = new G4ProcVector();
     82    //
    8083    G4ProcVector::iterator i;
    81     for (i = pProcVector->begin(); i!= pProcVector->end(); ++i) {
     84    for (i = pProcVector->begin(); i!= pProcVector->end(); ++i)
     85    {
    8286      pProcVector->push_back(*i);
    8387    }
    … …  
    8589  return *this;
    8690}
    87 
    88 

  • trunk/source/processes/management/src/G4VContinuousDiscreteProcess.cc

    r819 r963  
    2626//
    2727// $Id: G4VContinuousDiscreteProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4VContinuousProcess.cc

    r819 r963  
    2626//
    2727// $Id: G4VContinuousProcess.cc,v 1.5 2007/10/02 08:23:20 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4VDiscreteProcess.cc

    r819 r963  
    2626//
    2727// $Id: G4VDiscreteProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4VProcess.cc

    r819 r963  
    2525//
    2626//
    27 // $Id: G4VProcess.cc,v 1.15.2.1 2008/04/25 11:47:07 kurasige Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4VProcess.cc,v 1.16 2007/11/15 04:10:18 kurasige Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
    … …  
    5252                    theProcessName(aName),
    5353                    theProcessType(aType),
     54                    theProcessSubType(-1),
    5455                    thePILfactor(1.0),
    55                     enableAtRestDoIt(true),
    56                     enableAlongStepDoIt(true),
    57                     enablePostStepDoIt(true),
     56                    enableAtRestDoIt(true),
     57                    enableAlongStepDoIt(true),
     58                    enablePostStepDoIt(true),
    5859                    verboseLevel(0)
     60
    5961{
    6062  pParticleChange = &aParticleChange;
    … …  
    7173            theProcessName(right.theProcessName),
    7274            theProcessType(right.theProcessType),
     75            theProcessSubType(right.theProcessSubType),
    7376            thePILfactor(1.0),
    74             enableAtRestDoIt(true),
    75             enableAlongStepDoIt(true),
    76             enablePostStepDoIt(true),
    77             verboseLevel(right.verboseLevel)
     77            enableAtRestDoIt(right.enableAtRestDoIt),
     78            enableAlongStepDoIt(right.enableAlongStepDoIt),
     79            enablePostStepDoIt(right.enablePostStepDoIt),
     80            verboseLevel(right.verboseLevel)
    7881{
    7982}
    … …  
    8689    theNumberOfInteractionLengthLeft -= previousStepSize/currentInteractionLength;
    8790    if(theNumberOfInteractionLengthLeft<0.) {
    88       theNumberOfInteractionLengthLeft=perMillion;
     91       theNumberOfInteractionLengthLeft=perMillion;
    8992    }         
    90    
     93
    9194  } else {
    9295#ifdef G4VERBOSE
    … …  
    186189{
    187190  G4cout << "Process Name " << theProcessName ;
    188   G4cout << " : Type[" << GetProcessTypeName(theProcessType) << "]"<< G4endl;
     191  G4cout << " : Type[" << GetProcessTypeName(theProcessType) << "]";
     192  G4cout << " : SubType[" << theProcessSubType << "]"<< G4endl;
    189193}
    190194

  • trunk/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc

    r819 r963  
    2626//
    2727// $Id: G4VRestContinuousDiscreteProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4VRestContinuousProcess.cc

    r819 r963  
    2626//
    2727// $Id: G4VRestContinuousProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4VRestDiscreteProcess.cc

    r819 r963  
    2626//
    2727// $Id: G4VRestDiscreteProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4VRestProcess.cc

    r819 r963  
    2626//
    2727// $Id: G4VRestProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/management/src/G4WrapperProcess.cc

    r819 r963  
    2626//
    2727// $Id: G4WrapperProcess.cc,v 1.1 2007/12/12 10:09:49 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
Note: See TracChangeset for help on using the changeset viewer.