Changeset 962 for trunk/source/processes/hadronic/models/qmd/include

Timestamp:

Apr 6, 2009, 12:30:29 PM (17 years ago)

Author:

garnier

Message:

update processes

Location:

trunk/source/processes/hadronic/models/qmd/include

Files:

• G4QMDCollision.hh (modified) (3 diffs)
• G4QMDMeanField.hh (modified) (2 diffs)
• G4QMDParticipant.hh (modified) (3 diffs)
• G4QMDReaction.hh (modified) (5 diffs)
• G4QMDSystem.hh (modified) (2 diffs)

trunk/source/processes/hadronic/models/qmd/include/G4QMDCollision.hh

@@ -34 +34 @@
 //      Creation date: 9 April 2007
 // -----------------------------------------------------------------------------
+//
+// 081120 Add deltaT in signature of CalKinematicsOfBinaryCollisions
 
 #ifndef G4QMDCollision_hh
@@ -49 +51 @@
       ~G4QMDCollision();
 
-      void CalKinematicsOfBinaryCollisions();
+      void CalKinematicsOfBinaryCollisions( G4double );
       G4bool CalFinalStateOfTheBinaryCollision( G4int , G4int );
       G4bool CalFinalStateOfTheBinaryCollisionJQMD( G4double , G4double , G4ThreeVector , G4double , G4double , G4ThreeVector , G4double , G4int , G4int );
@@ -55 +57 @@
 
       void SetMeanField ( G4QMDMeanField* meanfield ){ theMeanField = meanfield; theSystem = meanfield->GetSystem(); }
-
 
    private:

trunk/source/processes/hadronic/models/qmd/include/G4QMDMeanField.hh

@@ -34 +34 @@
 //      Creation date: 29 March 2007
 // -----------------------------------------------------------------------------
+// 081120 Add Update
 
 #ifndef G4QMDMeanField_hh
@@ -74 +75 @@
       std::vector< G4double > GetDepthOfPotential();  
 
+      void Update();
+
    private:
       G4double calPauliBlockingFactor( G4int ); 

trunk/source/processes/hadronic/models/qmd/include/G4QMDParticipant.hh

@@ -34 +34 @@
 //      Creation date: 29 March 2007
 // -----------------------------------------------------------------------------
+//
+// 081120 Add hit flag and related methods
 
 #ifndef G4QMDParticipant_hh
@@ -70 +72 @@
 
       void UnsetInitialMark() { projectile = false; target = false; }
+      void UnsetHitMark() { hit = false; }
+      G4bool IsThisHit() { return hit; }
+      void SetHitMark() { hit = true; }
+
       void SetProjectile() { projectile = true; }
       void SetTarget() { target = true; }
@@ -82 +88 @@
       G4bool projectile; 
       G4bool target; 
+      G4bool hit; 
 };
 

trunk/source/processes/hadronic/models/qmd/include/G4QMDReaction.hh

@@ -34 +34 @@
 //      Creation date: 02 April 2007
 // -----------------------------------------------------------------------------
+//
+// 081107 Add UnUseGEM (then use the default channel of G4Evaporation)
+//            UseFrag (chage criterion of a inelastic reaction)
+//
 
 #ifndef G4QMDReaction_hh
@@ -63 +67 @@
       G4HadFinalState *ApplyYourself( const G4HadProjectile &aTrack, G4Nucleus & targetNucleus );
 
+      void UnUseGEM(){ gem = false; setEvaporationCh(); };
+      void UseFRAG(){ frag = true; };
+
    private:
-      void setInitialCondition( G4QMDSystem* , G4QMDSystem* );
+
+      void setEvaporationCh();
 
       G4QMDMeanField* meanField;
@@ -70 +78 @@
       G4QMDCollision* collision;
 
-      void doPropagation();
       void doCollision();
       std::vector< G4QMDSystem* > doClusterJudgment();
@@ -80 +87 @@
       G4Evaporation* evaporation;
       G4ExcitationHandler* excitationHandler;
+
 //      G4VPreCompoundModel* preco; 
 
@@ -102 +110 @@
       G4IonsShenCrossSection genspaXS;
 
+      G4bool gem;
+      G4bool frag;
+
 };
 

trunk/source/processes/hadronic/models/qmd/include/G4QMDSystem.hh

@@ -34 +34 @@
 //      Creation date: 29 March 2007
 // -----------------------------------------------------------------------------
+//
+// 080602 Fix memory leaks by T. Koi 
+// 081120 Add EraseParticipant and InsertParticipant Methods by T. Koi
 
 #ifndef G4QMDSystem_hh
@@ -51 +54 @@
       void SubtractSystem ( G4QMDSystem* );
 
-      void DeleteParticipant( G4int i ) { participants.erase( std::find ( participants.begin() , participants.end() , participants[ i ] ) ); };
+      G4QMDParticipant* EraseParticipant( G4int i ) { G4QMDParticipant* particle =  participants[ i ]; participants.erase( std::find ( participants.begin() , participants.end() , participants[ i ] ) ) ; return particle; };
+      void DeleteParticipant( G4int i ) { delete participants[ i ] ; participants.erase( std::find ( participants.begin() , participants.end() , participants[ i ] ) ); };
+      void InsertParticipant( G4QMDParticipant* particle , G4int j );
 
       G4int GetTotalNumberOfParticipant() { return participants.size(); };