Changeset 1340 for trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src

Timestamp:

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

Author:

garnier

Message:

update ti head

Location:

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src

Files:

• G4QBesIKJY.cc (modified) (1 diff)
• G4QCHIPSWorld.cc (modified) (2 diffs)
• G4QCandidate.cc (modified) (1 diff)
• G4QChipolino.cc (modified) (1 diff)
• G4QContent.cc (modified) (1 diff)
• G4QDecayChan.cc (modified) (1 diff)
• G4QEnvironment.cc (modified) (12 diffs)
• G4QException.cc (modified) (1 diff)
• G4QHadron.cc (modified) (1 diff)
• G4QInteraction.cc (modified) (1 diff)
• G4QIsotope.cc (modified) (1 diff)
• G4QNucleus.cc (modified) (4 diffs)
• G4QPDGCode.cc (modified) (7 diffs)
• G4QParentCluster.cc (modified) (1 diff)
• G4QParticle.cc (modified) (3 diffs)
• G4QParton.cc (modified) (1 diff)
• G4QPartonPair.cc (modified) (1 diff)
• G4QProbability.cc (modified) (1 diff)
• G4QString.cc (modified) (1 diff)
• G4Quasmon.cc (modified) (7 diffs)

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QBesIKJY.cc

@@ -26 +26 @@
 //
 // $Id: G4QBesIKJY.cc,v 1.4 2009/11/10 17:13:46 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QBesIKJY ----------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCHIPSWorld.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4QCHIPSWorld.cc,v 1.33 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4QCHIPSWorld.cc,v 1.34 2010/06/23 13:56:30 mkossov Exp $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QCHIPSWorld ----------------
@@ -100 +100 @@
 {
   //static const G4int mnofParts = 486;           // max number of particles (up to A=80)
-  static const G4int mnofParts = 494;           // max number of particles (up to A=80) IN
+  //static const G4int mnofParts = 494;           // max number of particles (up to A=80)
+  static const G4int mnofParts = 512; // max#of particles,A<57,G4QParticle::InitDecayVector
   static const G4bool cf = true;                // verbose=true G4QPDG construction flag
 #ifdef debug

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCandidate.cc

@@ -26 +26 @@
 //
 // $Id: G4QCandidate.cc,v 1.35 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QCandidate ----------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QChipolino.cc

@@ -26 +26 @@
 //
 // $Id: G4QChipolino.cc,v 1.36 2009/08/10 16:36:53 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QChipolino ----------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QContent.cc

@@ -26 +26 @@
 //
 // $Id: G4QContent.cc,v 1.49 2009/08/07 14:20:57 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QContent ----------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QDecayChan.cc

@@ -26 +26 @@
 //
 // $Id: G4QDecayChan.cc,v 1.28 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QDecayChan ----------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QEnvironment.cc

@@ -28 +28 @@
 //
 //
-// $Id: G4QEnvironment.cc,v 1.167 2010/06/19 07:46:44 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4QEnvironment.cc,v 1.171 2010/06/25 14:03:44 mkossov Exp $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QEnvironment ----------------
@@ -4476 +4476 @@
   static const G4double mXiM = G4QPDGCode(3312).GetMass();
   static const G4double mOmM = G4QPDGCode(3334).GetMass();
-#ifdef debug
   static const G4double mDeut= G4QPDGCode(2112).GetNuclMass(1,1,0);
-#endif
   static const G4double mTrit= G4QPDGCode(2112).GetNuclMass(1,2,0);
   static const G4double mHe3 = G4QPDGCode(2112).GetNuclMass(2,1,0);
@@ -5938 +5936 @@
       G4LorentzVector cH4Mom = curHadr->Get4Momentum(); // 4-mom of the current hadron
       tot4Mom-=cH4Mom;                          // Reduce theTotal 4mom by theCurrent 4mom
+      totCharge-=curHadr->GetCharge();          // @!@
+      totBaryoN-=curHadr->GetBaryonNumber();    // @!@
+#ifdef pdebug
+        G4cout<<"G4QE::FSI:Cur4M="<<tot4Mom<<",tC="<<totCharge<<",tB="<<totBaryoN<<G4endl;
+#endif
       if(hadron+1==nHadr)                       // The Last Hadron in the set
       {
+#ifdef pdebug
+        G4cout<<"G4QE::FSI:Last4M="<<tot4Mom<<",tC="<<totCharge<<",tB="<<totBaryoN<<G4endl;
+#endif
+        G4double misM=0.;                       // @!@
+        G4int mPDG=0;                           // @!@
+        if(totCharge>=0 && totBaryoN > 0)       // @!@
+        {                                       // @!@
+          mPDG=90000000+999*totCharge+totBaryoN;// @!@
+          misM=G4QPDGCode(mPDG).GetMass();      // @!@
+        }                                       // @!@
         G4double re =tot4Mom.e();
         G4double rpx=tot4Mom.px();
         G4double rpy=tot4Mom.py();
         G4double rpz=tot4Mom.pz();
+        G4double re2=re*re;                     // @!@
         G4double dmo=rpx*rpx+rpy*rpy+rpz*rpz;
-        G4double dem=re*re+dmo;
-#ifdef debug
-        G4cout<<"G4QE::FSI: Is Energy&Mom conserved? t4M="<<tot4Mom<<",d2="<<dem<<G4endl;
-#endif
-        //if(2>3)                                 //@@En/Mom conservation check is closed
-        if(dem>0.0001)                          // Energy or momentum is not conserved
-        {
-#ifdef debug
-          if(dem>.1)
-          {
-            G4cout<<"---Warning---G4QE::FSI:E/Mcons4M="<<tot4Mom<<dem<<".Correct!"<<G4endl;
-            G4LorentzVector cor4M(0.,0.,0.,mNeut);  // Prototype for the neutron
+        G4double dem=re2+dmo;
+        G4double dm2=re2-dmo;                   // @!@
+        G4double sdm=0.;                        // @!@
+        if(dm2>0.) sdm=std::sqrt(dm2);          // @!@
+#ifdef debug
+        G4cout<<"G4QE::FSI: Is En&Mom conserved? t4M="<<tot4Mom<<",dM="<<sdm<<", mM="<<misM
+              <<",mPDG="<<mPDG<<",dCH="<<totCharge<<",dBN="<<totBaryoN<<G4endl;
+#endif
+        G4LorentzVector cor4M(0.,0.,0.,0.);     // Prototype for the missing particle
+        if(dem>0.1)                             // Energy or momentum is not conserved
+        {
+#ifdef pdebug
+          G4cout<<"--Warning--G4QE::FSI:dE/Mc4M="<<tot4Mom<<sdm<<". Correct it!"<<G4endl;
+#endif
+            if(sdm < .01 || (re2 > 0. && !totCharge && !totBaryoN && sdm/re2 < .0001)) // @!@
+          {
+#ifdef pdebug
+            G4cout<<"...G4QE::FSI:E/M conservation is corrected by a photon"<<G4endl;
+#endif
+            cor4M=tot4Mom;                                 // Complete correction
+            G4QHadron* theH = new G4QHadron(22,tot4Mom);
+            theQHadrons.push_back(theH);    // (delete equivalent for the proton)
+          }
+          else                                             // @!@
+          {
             if(dmo<0.0001 && re>900.)               // MomentumIsConserved - recoverMissing
             {
               if(fabs(re-mNeut)<.01)
               {
+#ifdef pdebug
                 G4cout<<"...G4QE::FSI:E/M conservation is corrected by neutron"<<G4endl;
-                //cor4M=G4LorentzVector(0.,0.,0.,mNeut); // Made as a prototype
+#endif
+                cor4M=G4LorentzVector(0.,0.,0.,mNeut);
                 G4QHadron* theH = new G4QHadron(90000001,G4LorentzVector(0.,0.,0.,mNeut));
                 theQHadrons.push_back(theH);  // (delete equivalent for the proton)
@@ -5968 +5997 @@
               else if(fabs(re-mProt)<.01)
               {
+#ifdef pdebug
                 G4cout<<"...G4QE::FSI:E/M conservation is corrected by proton"<<G4endl;
+#endif
                 cor4M=G4LorentzVector(0.,0.,0.,mProt);
                 G4QHadron* theH = new G4QHadron(90001000,G4LorentzVector(0.,0.,0.,mProt));
@@ -5975 +6006 @@
               else if(fabs(re-mDeut)<.01)
               {
+#ifdef pdebug
                 G4cout<<"...G4QE::FSI:E/M conservation is corrected by deuteron"<<G4endl;
+#endif
                 cor4M=G4LorentzVector(0.,0.,0.,mDeut);
                 G4QHadron* theH = new G4QHadron(90001001,G4LorentzVector(0.,0.,0.,mDeut));
@@ -5982 +6015 @@
               else if(fabs(re-mTrit)<.01)
               {
+#ifdef pdebug
                 G4cout<<"...G4QE::FSI:E/M conservation is corrected by tritium"<<G4endl;
+#endif
                 cor4M=G4LorentzVector(0.,0.,0.,mTrit);
                 G4QHadron* theH = new G4QHadron(90001002,G4LorentzVector(0.,0.,0.,mTrit));
@@ -5989 +6024 @@
               else if(fabs(re-mHe3)<.01)
               {
+#ifdef pdebug
                 G4cout<<"...G4QE::FSI:E/M conservation is corrected by He3"<<G4endl;
+#endif
                 cor4M=G4LorentzVector(0.,0.,0.,mHe3);
                 G4QHadron* theH = new G4QHadron(90002001,G4LorentzVector(0.,0.,0.,mHe3));
@@ -5996 +6033 @@
               else if(fabs(re-mAlph)<.01)
               {
+#ifdef pdebug
                 G4cout<<"...G4QE::FSI:E/M conservation is corrected by alpha"<<G4endl;
+#endif
                 cor4M=G4LorentzVector(0.,0.,0.,mAlph);
                 G4QHadron* theH = new G4QHadron(90002002,G4LorentzVector(0.,0.,0.,mAlph));
@@ -6004 +6043 @@
               {
                 cor4M=G4LorentzVector(0.,0.,0.,mNeut+mNeut);
+#ifdef pdebug
                 G4cout<<"...G4QE::FSI:E/M conservation is corrected by 2 neutrons"<<G4endl;
+#endif
                 G4QHadron* theH1 = new G4QHadron(90000001,G4LorentzVector(0.,0.,0.,mNeut));
                 theQHadrons.push_back(theH1); // (delete equivalent for the proton)
@@ -6012 +6053 @@
               else if(fabs(re-mProt-mProt)<.01)
               {
+#ifdef pdebug
                 G4cout<<"...G4QE::FSI:E/M conservation is corrected by 2 protons"<<G4endl;
+#endif
                 cor4M=G4LorentzVector(0.,0.,0.,mProt+mProt);
                 G4QHadron* theH1 = new G4QHadron(90001000,G4LorentzVector(0.,0.,0.,mProt));
@@ -6019 +6062 @@
                 theQHadrons.push_back(theH2); // (delete equivalent for the proton)
               }
-              else throw G4QException("***G4QEnv::FSInteract: Increase theCorrectionEps");
+                  else throw G4QException("***G4QEnv::FSInteract: Try heavier nuclei at rest");
+            }
+            else if(std::abs(sdm-misM) < 0.01)        // on flight correction @!@
+            {
+#ifdef pdebug
+              G4cout<<"...G4QE::FSI:E/M conservation is corrected by ResidualNucl"<<G4endl;
+#endif
+              if(!misM) mPDG=22;
+              G4QHadron* theH = new G4QHadron(mPDG,tot4Mom); // Create Residual Nucleus
+              cor4M=tot4Mom;                  // Complete correction
+              if(std::fabs(sdm-misM) <= 0.01) theQHadrons.push_back(theH); // As is
+              else EvaporateResidual(theH);   // Evaporate Residual Nucleus
             }
             else
             {
-              // @@ Temporary very bad correction: just to pass through @@
-              curHadr->Set4Momentum(cH4Mom+tot4Mom); // modify 4-mom of the Last hadron
-              G4cout<<"*!* G4QE::FSI:E/M dif is added to theLast="<<tot4Mom+cH4Mom<<G4endl;
-              if(curHadr->GetBaryonNumber()>1)
+              G4QHadron* prevHadr = theQHadrons[nHadr-2]; // GetPointer to Prev to theLast
+              G4LorentzVector pH4Mom = prevHadr->Get4Momentum(); // 4mom of thePrevHadron
+              G4double cHM = curHadr->GetMass();  // Mass of the current hadron
+              G4double pHM = prevHadr->GetMass(); // Mass of the previous hadron
+              tot4Mom+=cH4Mom+pH4Mom;
+              G4double totRM=tot4Mom.m();
+              if(cHM+pHM<=totRM)                  // *** Make the final correction ***
+                {
+                if(!G4QHadron(tot4Mom).DecayIn2(pH4Mom,cH4Mom))
+                {
+                  G4cout<<"***G4QE::FSI:**Correction**tot4M="<<tot4Mom<<totRM<<">sM="
+                        <<cHM+cHM<<G4endl;
+#ifdef pdebug
+                  throw G4QException("***G4QEnvironment::FSInteract:CORRECT DecIn2 error");
+#endif
+                }
+#ifdef chdebug
+                G4cout<<"---Warning---G4QE::FSI:***CORRECTION IS DONE*** d="<<dem<<G4endl;
+#endif
+                curHadr->Set4Momentum(cH4Mom);
+                prevHadr->Set4Momentum(pH4Mom);
+              }
+              else
               {
-                G4QHadron* theNew  = new G4QHadron(curHadr); // Make NewHadr of theLastHadr
-                theQHadrons.pop_back();       // theLastQHadron is excluded from theOUTPUT
-                delete curHadr;//!!When kill,DON'T forget to delete theLastQH as an inst.!!
-                EvaporateResidual(theNew);    // Try to evaporate Residual
+                G4cerr<<"*!*G4QE::FSI: "<<cHM<<"+"<<pHM<<"="<<cHM+pHM<<">"<<totRM<<G4endl;
+#ifdef pdebug
+                throw G4QException("***G4QEnvironment::FSInteraction:TEMPORARY EXCEPTION");
+#endif
               }
-              //throw G4QException("***G4QEnv::FSInteract: Energy/Momentum conservation");
             }
             tot4Mom=tot4Mom-cor4M;
+#ifdef pdebug
             G4cout<<"---Warning---G4QE::FSI:En/MomCons.Error is corrected:"<<cor4M<<G4endl;
-          }
-#endif
+#endif
+          }
           G4double cHM = curHadr->GetMass();  // Mass of the current hadron
           G4int ch=0;
@@ -6077 +6150 @@
         }
 #ifdef debug
-        else G4cout<<"G4QE::FSI: Yes, it is. d="<<dem<<" for "<<nHadr<<" hadrons."<<G4endl;
-#endif
+        else  G4cout<<"...G4QE::FSI:E/M conservation is good enough"<<G4endl;
+        G4cout<<"G4QE::FSI:EMCorrection by "<<theQHadrons.size()-nHadr<<" hadrons"<<G4endl;
+#endif
+        break;
       }
     } // End of the Back fusion LOOP

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QException.cc

@@ -26 +26 @@
 //
 // $Id: G4QException.cc,v 1.10 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QException ----------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadron.cc

@@ -26 +26 @@
 //
 // $Id: G4QHadron.cc,v 1.64 2009/09/02 15:45:19 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QHadron ----------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QInteraction.cc

@@ -26 +26 @@
 //
 // $Id: G4QInteraction.cc,v 1.6 2009/08/28 14:49:10 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 // ------------------------------------------------------------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QIsotope.cc

@@ -26 +26 @@
 //
 // $Id: G4QIsotope.cc,v 1.16 2010/05/28 15:03:46 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QIsotope class ----------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QNucleus.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4QNucleus.cc,v 1.118 2010/06/10 08:37:27 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4QNucleus.cc,v 1.120 2010/06/24 16:20:11 mkossov Exp $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QNucleus ----------------
@@ -109 +109 @@
   currentNucleon(-1), rho0(1.), radius(1.), Tb(), TbActive(false), RhoActive(false)
 {
+  if(nucPDG==22) nucPDG=90000000;
   InitByPDG(nucPDG);
   G4LorentzVector p(0.,0.,0.,GetGSMass());
@@ -3134 +3135 @@
     }
     // @@ in case of the Ksi or Omega- capture it can disturb the simulation
-    else if(cPDG<80000000&&(abs(cPDG)%10>4||cST>2))// @@ PreClosed HighSpin/Strange hadrons
+    else if(cPDG<80000000&&(abs(cPDG)%10>4||cST>2))// @@ PreClosed HighSpin/HighStrange
     {
       curCand->SetPreProbability(0.);  
@@ -3267 +3268 @@
       else
       {
+#ifdef cldebug
+        G4cout<<"G4QNucl::PrepCand:cPDG="<<cPDG<<",pos="<<pos<<G4endl;
+#endif
         curCand->SetPreProbability(pos);           // ===> Hadronic case in Vacuum     
         curCand->SetDenseProbability(0.);          // ===> Hadronic case in Vacuum

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGCode.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4QPDGCode.cc,v 1.65 2010/06/10 08:37:27 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4QPDGCode.cc,v 1.68 2010/06/25 14:03:44 mkossov Exp $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QPDGCode ----------------
@@ -58 +58 @@
   if(PDGCode==130) PDGCode= 311; // Safety. Should not happen.
   if(PDGCode==310) PDGCode=-311; // Safety. Should not happen.
-  if(PDGCode) theQCode=MakeQCode(PDGCode);
+  if(PDGCode==90000000)
+  {
+    thePDGCode=22;
+    theQCode=6;
+  }
+  else if(PDGCode) theQCode=MakeQCode(PDGCode);
   else        
   {
@@ -329 +334 @@
   else if (PDGC>80000000 && PDGC<100000000) // Try to convert the NUCCoding to PDGCoding
   {
-    if(PDGC==90000000) return 6;
+    //if(PDGC==90000000) return 6;            // @@ already done in the constructor
     ConvertPDGToZNS(PDGC, z, n, s);
     G4int b=n+z+s;                                 // Baryon number
@@ -380 +385 @@
       if(b==1)                                     // --> Baryons+Hyperons
       {
-        if(!s)                                     // --> Baryons
+        if(PDGC>80000000)
         {
-          if(z==-1)    return 34;                  // Delta-
-          else if(!z)  return 20;                  // neutron
-          else if(z==1)return 21;                  // proton
-          else if(z==2)return 37;                  // Delta++
-          else if(z==3||z==-2)return -1;           // Delta+pi Chipolino
-          else         return -2;                  // Not supported by Q Code
+          if(!s)                                     // --> Baryons
+          {
+            if     (!z)  return 90;                  // neutron
+            else if(z==1)return 91;                  // proton
+            else         return -2;                  // Not supported by Q Code
+          }
+          else if(s==1)                              // --> Hyperons
+          {
+            if(z==-1)    return 93;                  // Sigma-
+            else if(!z)  return 92;                  // Lambda
+            else if(z==1)return 94;                  // Sigma+
+            else         return -2;                  // Not supported by Q Code
+          }
+          else if(s==2)                              // --> Xi Hyperons
+          {
+            if(z==-1)    return 95;                  // Xi-
+            else if(!z)  return 96;                  // Xi0
+            else         return -2;                  // Not supported by Q Code
+          }
+          else if(s==3)                              // --> Xi Hyperons
+          {
+            if(z==-1)    return 97;                  // Omega-
+            else         return -2;                  // Not supported by Q Code
+          }
         }
-        else if(s==1)                              // --> Hyperons
+        else
         {
-          if(z==-1)    return 23;                  // Sigma-
-          else if(!z)  return 22;                  // Lambda (@@ 24->Sigma0)
-          else if(z==1)return 25;                  // Sigma+
-          else if(z==2||z==-2) return -1;          // Sigma+pi Chipolino
-          else         return -2;                  // Not supported by Q Code
-        }
-        else if(s==2)                              // --> Xi Hyperons
-        {
-          if(z==-1)    return 26;                  // Xi-
-          else if(!z)  return 27;                  // Xi0
-          else if(z==1||z==-2)return -1;           // Xi+pi Chipolino
-          else         return -2;                  // Not supported by Q Code
-        }
-        else if(s==3)                              // --> Xi Hyperons
-        {
-          if(z==-1)    return 44;                  // Omega-
-          else if(!z||z==-2)  return -1;           // Omega+pi Chipolino
-          else         return -2;                  // Not supported by Q Code
+          if(!s)                                     // --> Baryons
+          {
+            if(z==-1)    return 34;                  // Delta-
+            else if(!z)  return 20;                  // neutron
+            else if(z==1)return 21;                  // proton
+            else if(z==2)return 37;                  // Delta++
+            else if(z==3||z==-2)return -1;           // Delta+pi Chipolino
+            else         return -2;                  // Not supported by Q Code
+          }
+          else if(s==1)                              // --> Hyperons
+          {
+            if(z==-1)    return 23;                  // Sigma-
+            else if(!z)  return 22;                  // Lambda (@@ 24->Sigma0)
+            else if(z==1)return 25;                  // Sigma+
+            else if(z==2||z==-2) return -1;          // Sigma+pi Chipolino
+            else         return -2;                  // Not supported by Q Code
+          }
+          else if(s==2)                              // --> Xi Hyperons
+          {
+            if(z==-1)    return 26;                  // Xi-
+            else if(!z)  return 27;                  // Xi0
+            else if(z==1||z==-2)return -1;           // Xi+pi Chipolino
+            else         return -2;                  // Not supported by Q Code
+          }
+          else if(s==3)                              // --> Xi Hyperons
+          {
+            if(z==-1)    return 44;                  // Omega-
+            else if(!z||z==-2)  return -1;           // Omega+pi Chipolino
+            else         return -2;                  // Not supported by Q Code
+          }
         }
       }
@@ -587 +622 @@
         }
       }
-      G4int c=b/2;
+      G4int c=b/2;              // From here b>3: (4,5):c=2,g=0,1; (6,7):c=3,g=0,1; ...
       G4int g=b%2;
       G4int h=c*3;
@@ -2199 +2234 @@
 }
 
-
 // Relative Cross Index for q_i->q_o (q=0(d),1(u),2(s), 7 means there is no such cluster)
 G4int G4QPDGCode::GetRelCrossIndex(G4int i, G4int o)  const
@@ -2228 +2262 @@
   if(theQCode<fragmStart) return 7;
   G4int sub=theQCode-fragmStart;
-  if ( (sub > 1 && sub < 8) || sub == 15) return 7;//Why they are in clusters?-Residuals(?)
+  if ( (sub > 1 && sub < 8) || (sub > 12 && sub <16)) return 7; // SuperIso & SuperStrange 
   G4int rel=sub;                         // case of nuclear baryons and isonuclei
-  if     (sub>31)rel =(sub-32)%15;       // case of heavy fragments (BaryNum>3)
-  else if(sub>15)rel = sub-16;           // case of nuclear di-baryon & tri-baryons
+  if     (sub>31) rel =(sub-32)%15;      // case of heavy fragments (BaryNum>3)
+  else if(sub>15) rel = sub-16;          // case of nuclear di-baryon & tri-baryons
 #ifdef debug
   G4cout<<"G4QPDGCode::RelGetCrossIndex:i="<<i<<",o="<<o<<",su="<<sub<<",re="<<rel<<G4endl;
 #endif
+  //if ( (rel > 5 && rel < 9) || (rel > 13 && rel <16)) return 7; // SuperStrange're closed
   if     (!i)                            // ==> input quark = 0(d) (d=-1/3)
   {

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParentCluster.cc

@@ -26 +26 @@
 //
 // $Id: G4QParentCluster.cc,v 1.26 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QParentCluster ----------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParticle.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4QParticle.cc,v 1.34 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4QParticle.cc,v 1.36 2010/06/25 14:03:44 mkossov Exp $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4QParticle ----------------
@@ -158 +158 @@
   //static G4int nP = 486;                  // Up to A=80
   //static const G4int nP = 494;              // Up to A=80(?) "Isonuclear revision"
-  static const G4int nP = 512;              // Up to A=56 "Leptons/Hypernuclei revision"
+  static const G4int nP = 512; // A<57 "Leptons/Hypernuclei" G4QCHIPSWorld::GetParticles(!)
   //static G4QDecayChanVector* DecayDB = new G4QDecayChanVector[nP];
   static G4QDecayChanVector DecayDB[nP];
@@ -748 +748 @@
     if(limit<=101&&nQ>=101)DecayDB[101].push_back(new G4QDecayChan(1.,3122,2112));//Ln
     if(limit<=102&&nQ>=102)DecayDB[102].push_back(new G4QDecayChan(1.,3122,2212));//Lp
+    if(limit<=104&&nQ>=104)DecayDB[104].push_back(new G4QDecayChan(1.,3112,2112));//nSig-
     if(limit<=103&&nQ>=103)DecayDB[103].push_back(new G4QDecayChan(1.,3122,3122));//LL
-    if(limit<=104&&nQ>=104)DecayDB[104].push_back(new G4QDecayChan(1.,3112,2112));//nSig-
     if(limit<=105&&nQ>=105)DecayDB[105].push_back(new G4QDecayChan(1.,3222,2212));//pSig+
     //if(limit<=106&&nQ>=106)DecayDB[106] = 0; // t

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParton.cc

@@ -26 +26 @@
 //
 // $Id: G4QParton.cc,v 1.9 2009/07/17 16:54:57 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 // ------------------------------------------------------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPartonPair.cc

@@ -27 +27 @@
 //
 // $Id: G4QPartonPair.cc,v 1.2 2009/02/23 09:49:24 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 // ------------------------------------------------------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QProbability.cc

@@ -26 +26 @@
 //
 // $Id: G4QProbability.cc,v 1.3 2009/09/04 16:13:19 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 // ------------------------------------------------------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QString.cc

@@ -26 +26 @@
 //
 // $Id: G4QString.cc,v 1.17 2009/09/04 14:38:00 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 // ------------------------------------------------------------

trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4Quasmon.cc

@@ -28 +28 @@
 //
 //
-// $Id: G4Quasmon.cc,v 1.125 2010/06/10 08:37:27 mkossov Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4Quasmon.cc,v 1.127 2010/06/25 14:03:44 mkossov Exp $
+// GEANT4 tag $Name: hadr-chips-V09-03-08 $
 //
 //      ---------------- G4Quasmon ----------------
@@ -2382 +2382 @@
           G4cerr<<"G4Q::HQ:EV-6:TotEVAPORATION:s="<<sPDG<<",T="<<kinE<<",RM="<<retN4Mom.m()
                 <<"<"<<tmpTM<<",tQC="<<transQC<<",E="<<excE<<",sM="<<sumM<<">tM="<<totMass
-                <<",sCB="<<sCB<<",nQ="<<nQuasms<<G4endl;
+                <<",nQ="<<nQuasms<<G4endl;
           throw G4QException("G4Quasmon::HadrQuasm: Why Fail?(6)ProductMasses>totalMass");
 #endif
@@ -4448 +4448 @@
 // Randomize the Resonance masses and calculate probabilities of hadronization for them
 void G4Quasmon::CalculateHadronizationProbabilities
-  (G4double E, G4double kVal, G4LorentzVector k4M,G4bool piF, G4bool gaF, G4bool first)
+  (G4double E, G4double kVal, G4LorentzVector k4M,G4bool piF, G4bool gaF, G4bool )
+  //(G4double E, G4double kVal, G4LorentzVector k4M,G4bool piF, G4bool gaF, G4bool first)
 //   =====================================================================E is not used====
 {                                                                  //       ^
@@ -4529 +4530 @@
       //G4bool pos=curCand->GetPossibility();
 #ifdef pdebug
+      G4bool pPrint= (abs(cPDG)%10 <3 && cPDG <80000000) || (cPDG >80000000 && frM <5000.);
       //G4bool pPrint = abs(cPDG)%10<3 && cPDG<80000000 ||cPDG==90001000||cPDG==90000001||
       //  cPDG==90000002||cPDG==90001001||cPDG==90001002||cPDG==90002001||cPDG==90002002;
       //G4bool pPrint = cPDG==2212 || cPDG==2112 ||cPDG==90001000||cPDG==90000001;
-      G4bool pPrint = false;
+      //G4bool pPrint = false;
+      //G4bool pPrint = true;
       if(pPrint) G4cout<<"G4Q::CHP:==****==>>>c="<<cPDG<<",dUD="<<dUD<<",pos="<<pos<<",eA="
                        <<envA<<",tM="<<totMass<<" > tmpTM+frM="<<tmpTM+frM<<G4endl;
@@ -4715 +4718 @@
                     //if ( (!piF && first && baryn < 3) || 
                     //     (!piF && !first) || 
-                    if ( (!piF && first && baryn < 3) || 
-                         (!piF && !first && baryn < 5 ) || 
+                    /////if ( (!piF && first && baryn < 3) || 
+                    /////     (!piF && !first && baryn < 5 ) || 
+                    if ( (!piF && baryn < 5 ) || 
                          ( piF && abs(dS) < 3) ) // Isotope Focusing for AtRest Reactions
                     //if(!qIso&&!dC||qIso>0&&dC<0||qIso<0&&dC>0)//MediumIsoFocusingForAll
@@ -4889 +4893 @@
                         // ***VTN*** CHECK IsNecessety toRecover theColTotRes to MinMassTot
                         if(mintM2>rtQ2) //==> Check of ResidualTotalNucleus ** Always **
-                        //if(2>3)  // Negligable difference difference
+                        //if(2>3)  // Negligable difference
                         {
                           G4double nz=0.;
@@ -5071 +5075 @@
                         G4double lp=1.-(dkLS+sr+sr)/boundM;//qm=k+sqrt((E*(M-m)/M)^2-m^2)
 #ifdef debug
-                        if(pPrint) G4cout<<"G4Q::CHP:qa_k+sr="<<lp<<",sr="<<sr<<",m="
-                                         <<mex<<",M="<<frM<<G4endl;
+                        if(pPrint) G4cout<<"G4Q::CHP:qa_k+sr="<<lp<<",sr="<<sr
+                                         <<",M="<<frM<<G4endl;
 #endif
                         if(lp>0.&&lp<1.&&lp>lz)