Changeset 1055 for trunk/source/processes/hadronic/models/parton_string/qgsm

Timestamp:

May 28, 2009, 4:26:57 PM (15 years ago)

Author:

garnier

Message:

maj sur la beta de geant 4.9.3

Location:

trunk/source/processes/hadronic/models/parton_string/qgsm

Files:

• History (modified) (2 diffs)
• include/G4QGSParticipants.hh (modified) (1 diff)
• src/G4GammaParticipants.cc (modified) (1 diff)
• src/G4QGSParticipants.cc (modified) (3 diffs)
• src/G4SPBaryon.cc (modified) (1 diff)

trunk/source/processes/hadronic/models/parton_string/qgsm/History

@@ -1 @@
-$Id: History,v 1.6 2008/09/19 09:54:23 gunter Exp $
+$Id: History,v 1.8 2009/05/19 12:48:42 gunter Exp $
 -------------------------------------------------------------------
 
@@ -16 +16 @@
      ---------------------------------------------------------------
 
+19 May 2009, G.Folger           (hadr-qgsm-V09-02-02)
+-----------------------------------------------------
+- fix in G4SPBaryon: for antibaryon, a  diquark & quark was given instead of 
+      anti-diquark & antiquark; note the reverse order, too. 
+    Fixes problems with incident anti baryons, e.g. antiproton, manifesting
+    in problems with forming hadrons.
+
+29 Apr 2009 m. Kosov       (hadr-qgsm-V09-02-01)
+------------------------------------------------
+Very important bug fix in G4QGSParticipants.cc to let QGSC working from E=0
+Added by GF (19-May-09):
+- this very important "bug" fix modifies G4G4QGSParticipants.cc and
+   G4GammaParticipants.cc:
+     changing the value of Threshold from 0.45 GeV to 0.GeV, 
+     and disables an Exception if s < sqr(total mass + Threshold)
 
 15 Sep 2008 G.Folger       (hadr-qgsm-V09-01-01)

trunk/source/processes/hadronic/models/parton_string/qgsm/include/G4QGSParticipants.hh

@@ -83 +83 @@
     enum  { SOFT, DIFFRACTIVE };
     const G4int nCutMax; 
-    const G4double ThersholdParameter; 
-    const G4double QGSMThershold; 
+    const G4double ThresholdParameter; 
+    const G4double QGSMThreshold; 
     const G4double theNucleonRadius;
     

trunk/source/processes/hadronic/models/parton_string/qgsm/src/G4GammaParticipants.cc

@@ -50 +50 @@
   G4double ThresholdMass = thePrimary.GetMass() + theTargetNuc[0]->GetDefinition()->GetPDGMass(); 
   ModelMode = SOFT;
-  if (sqr(ThresholdMass + ThersholdParameter) > s)
+  if (sqr(ThresholdMass + ThresholdParameter) > s)
   {
-    throw G4HadronicException(__FILE__, __LINE__, "Initial energy is too low. The 4-vectors of the input are inconsistant with the particle masses.");
+    ModelMode = DIFFRACTIVE;
+    //throw G4HadronicException(__FILE__, __LINE__, "Initial energy is too low. The 4-vectors of the input are inconsistant with the particle masses.");
   }
-  if (sqr(ThresholdMass + QGSMThershold) > s) // thus only diffractive in cascade!
+  if (sqr(ThresholdMass + QGSMThreshold) > s) // thus only diffractive in cascade!
   {
     ModelMode = DIFFRACTIVE;

trunk/source/processes/hadronic/models/parton_string/qgsm/src/G4QGSParticipants.cc

@@ -36 +36 @@
 
 G4QGSParticipants::G4QGSParticipants() : theDiffExcitaton(), //0.7*GeV, 250*MeV, 250*MeV),
-                                         nCutMax(7),ThersholdParameter(0.45*GeV),
-                                         QGSMThershold(3*GeV),theNucleonRadius(1.5*fermi)
+                                         //nCutMax(7),ThresholdParameter(0.45*GeV),
+                                         nCutMax(7),ThresholdParameter(0.000*GeV),
+                                         QGSMThreshold(3*GeV),theNucleonRadius(1.5*fermi)
                                          
 {
@@ -43 +44 @@
 
 G4QGSParticipants::G4QGSParticipants(const G4QGSParticipants &right)
-: G4VParticipants(), nCutMax(right.nCutMax),ThersholdParameter(right.ThersholdParameter),
-  QGSMThershold(right.QGSMThershold),theNucleonRadius(right.theNucleonRadius)
+: G4VParticipants(), nCutMax(right.nCutMax),ThresholdParameter(right.ThresholdParameter),
+  QGSMThreshold(right.QGSMThreshold),theNucleonRadius(right.theNucleonRadius)
 {
 }
@@ -91 +92 @@
   G4double ThresholdMass = thePrimary.GetMass() + pNucleon->GetDefinition()->GetPDGMass(); 
   ModelMode = SOFT;
-  if (sqr(ThresholdMass + ThersholdParameter) > s)
-  {
-    throw G4HadronicException(__FILE__, __LINE__, "Initial energy is too low. The 4-vectors of the input are inconsistant with the particle masses.");
-  }
-  if (sqr(ThresholdMass + QGSMThershold) > s) // thus only diffractive in cascade!
+  if (sqr(ThresholdMass + ThresholdParameter) > s)
+  {
+    ModelMode = DIFFRACTIVE;
+    //throw G4HadronicException(__FILE__, __LINE__, "Initial energy is too low. The 4-vectors of the input are inconsistant with the particle masses.");
+  }
+  if (sqr(ThresholdMass + QGSMThreshold) > s) // thus only diffractive in cascade!
   {
     ModelMode = DIFFRACTIVE;

trunk/source/processes/hadronic/models/parton_string/qgsm/src/G4SPBaryon.cc

@@ -104 +104 @@
       if (theDefinition->GetPDGEncoding() < 0)
       {
-        quark = -(*i)->GetDiQuark();
-        diQuark = -(*i)->GetQuark();                   
+        quark = (*i)->GetDiQuark();
+        diQuark = (*i)->GetQuark();                   
       }
       else