Changeset 1342 for trunk/examples/extended/hadronic/Hadr01/src

Timestamp:

Nov 5, 2010, 4:08:39 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/examples/extended/hadronic/Hadr01/src

Files:

• Histo.cc (modified) (7 diffs)
• PhysicsList.cc (modified) (17 diffs)

trunk/examples/extended/hadronic/Hadr01/src/Histo.cc

@@ -52 +52 @@
   histName   = "histo";
   histType   = "root";
-  option     = "--noErrors uncompress";
+  option     = "";
   nHisto     = 0;
   defaultAct = 1;
@@ -86 +86 @@
   // Creating the analysis factory
   if(!af) af = AIDA_createAnalysisFactory();
-  if(verbose>0)
+  if(verbose>0) {
     G4cout<<"HIsto books analysis factory ......... "<<G4endl;
-
+  }
   // Creating the tree factory
   AIDA::ITreeFactory* tf = af->createTreeFactory();
-  if(verbose>0)
+  if(verbose>0) {
     G4cout<<"Histo books tree factory ......... "<<G4endl;
-
+  }
   G4String histExt = "";
   char* path = getenv("PHYSLIST");
-  if (path) histExt = "_" + G4String(path);
+  if (path) { histExt = "_" + G4String(path); }
 
   G4String histDir = "";
@@ -114 +114 @@
   for(G4int i=0; i<nHisto; i++) {
     if(active[i]) {
-      if(verbose>0)
+      if(verbose>0) {
         G4cout<<" I am in book: histogram "<< i << " id= " << ids[i] <<G4endl;
-
+      }
       G4String idd;
-      if(histType == "root") idd = "h" +  ids[i];
-      else                   idd = ids[i];
+      if(histType == "root") { idd = "h" +  ids[i]; }
+      else                   { idd = ids[i]; }
       histo[i] = hf->createHistogram1D(idd, tittles[i], bins[i], xmin[i], xmax[i]);
     } else {
@@ -128 +128 @@
   // Creating a tuple factory, whose tuples will be handled by the tree
   if(tupleList != "") {
-    if(verbose>0)
+    if(verbose>0) {
       G4cout<<"Histo books tuple factory for "<<tupleName <<G4endl;
-
+    }
     AIDA::ITupleFactory* tpf = af->createTupleFactory( *tree );
     ntup = tpf->create(tupleId, tupleName, tupleList);
@@ -225 +225 @@
 void Histo::fill(G4int i, G4double x, G4double w)
 {
-  if(verbose > 1) 
+  if(verbose > 1) {
     G4cout << "fill histogram: #" << i << " at x= " << x 
            << "  weight= " << w << " unit= " << unit[i]
-           << G4endl;   
+           << G4endl;
+  }   
 #ifdef G4ANALYSIS_USE  
   if(i>=0 && i<nHisto) {
@@ -242 +243 @@
 void Histo::scale(G4int i, G4double x)
 {
-  if(verbose > 0) 
+  if(verbose > 0) { 
     G4cout << "Scale histogram: #" << i << " by factor " << x << G4endl;   
-
+  }
 #ifdef G4ANALYSIS_USE  
   if(i>=0 && i<nHisto) {
@@ -269 +270 @@
 void Histo::fillTuple(const G4String& parname, G4double x)
 {
-  if(verbose > 1) 
+  if(verbose > 1) {
     G4cout << "fill tuple by parameter <" << parname << "> = " << x << G4endl; 
- 
+  }
 #ifdef G4ANALYSIS_USE  
   if(ntup) ntup->fill(ntup->findColumn(parname), (float)x);

trunk/examples/extended/hadronic/Hadr01/src/PhysicsList.cc

@@ -25 +25 @@
 //
 //
-// $Id: PhysicsList.cc,v 1.33 2010/06/11 17:01:26 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: PhysicsList.cc,v 1.36 2010/10/25 16:15:08 vnivanch Exp $
+// GEANT4 tag $Name: examples-V09-03-09 $
 //
 /////////////////////////////////////////////////////////////////////////
@@ -52 +52 @@
 #include "G4EmPenelopePhysics.hh"
 #include "G4HadronElasticPhysics.hh"
-#include "G4HadronDElasticPhysics.hh"
-#include "G4HadronQElasticPhysics.hh"
+#include "G4HadronElasticPhysicsXS.hh"
+#include "G4HadronElasticPhysics93.hh"
 #include "G4HadronElasticPhysicsHP.hh"
 #include "G4HadronElasticPhysicsLHEP.hh"
 #include "G4HadronHElasticPhysics.hh"
+#include "G4HadronQElasticPhysics.hh"
 #include "G4ChargeExchangePhysics.hh"
 #include "G4NeutronTrackingCut.hh"
@@ -66 +67 @@
 #include "G4EmProcessOptions.hh"
 
-#include "HadronPhysicsFTFP_BERT_TRV.hh"
 #include "HadronPhysicsFTFP.hh"
 #include "HadronPhysicsFTFP_BERT.hh"
@@ -75 +75 @@
 #include "HadronPhysicsQGSC.hh"
 #include "HadronPhysicsQGSC_BERT.hh"
-#include "HadronPhysicsQGSC_CHIPS.hh"
-#include "HadronPhysicsQGSC_QGSC.hh"
 #include "HadronPhysicsQGSP.hh"
 #include "HadronPhysicsQGSP_BERT.hh"
@@ -85 +83 @@
 #include "HadronPhysicsQGS_BIC.hh"
 
-#include "G4HadronInelasticQLHEP.hh"
 #include "G4IonPhysics.hh"
 
@@ -154 +151 @@
 void PhysicsList::AddPhysicsList(const G4String& name)
 {
-  if (verboseLevel>0)
+  if (verboseLevel>0) {
     G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" << G4endl;
-
+  }
   if (name == "emstandard_opt2") {
 
@@ -192 +189 @@
     hadronPhys.push_back( new HadronPhysicsFTFP_BERT());
 
-  } else if (name == "FTFP_BERT_TRV") {
-
-    SetBuilderList1();
-    hadronPhys.push_back( new HadronPhysicsFTFP_BERT_TRV());
-
   } else if (name == "FTF_BIC") {
 
@@ -210 +202 @@
 
     AddPhysicsList("emstandard_opt1");
-    SetBuilderList3();
+    SetBuilderList2(true);
     hadronPhys.push_back( new HadronPhysicsLHEP_EMV());
 
@@ -216 +208 @@
 
     AddPhysicsList("emstandard_opt2");
-    SetBuilderList6();
+    SetBuilderList3(name);
     hadronPhys.push_back( new G4HadronInelasticQBBC());
 
@@ -222 +214 @@
 
     AddPhysicsList("emstandard_opt2");
-    SetBuilderList6();
-    hadronPhys.push_back( new G4HadronInelasticQBBC("QBBC_XGG",verboseLevel));
+    SetBuilderList3(name);
+    hadronPhys.push_back( new G4HadronInelasticQBBC(name,verboseLevel));
 
   } else if (name == "QBBC_XGGSN") {
 
     AddPhysicsList("emstandard_opt2");
-    SetBuilderList6();
-    hadronPhys.push_back( new G4HadronInelasticQBBC("QBBC_XGG",verboseLevel));
-
+    SetBuilderList3(name);
+    hadronPhys.push_back( new G4HadronInelasticQBBC(name,verboseLevel));
 
   } else if (name == "QGSC_BERT") {
@@ -236 +227 @@
     SetBuilderList4();
     hadronPhys.push_back( new HadronPhysicsQGSC_BERT());
-
-  } else if (name == "QGSC_CHIPS") {
-
-    SetBuilderList4();
-    hadronPhys.push_back( new HadronPhysicsQGSC_CHIPS());
 
   } else if (name == "QGSP_BERT") {
@@ -287 +273 @@
     SetBuilderList0(true);
     hadronPhys.push_back( new HadronPhysicsQGSP_BIC_HP());
-
-  } else if (name == "QGSP_BIC_EMY") {
-
-    AddPhysicsList("emstandard_opt3");
-    AddPhysicsList("QGSP_BIC");
 
   } else {
@@ -324 +305 @@
     hadronPhys.push_back( new G4HadronElasticPhysicsHP(verboseLevel) );
   } else {
-    hadronPhys.push_back( new G4HadronHElasticPhysics(verboseLevel) );
+    hadronPhys.push_back( new G4HadronElasticPhysics(verboseLevel) );
   }
   hadronPhys.push_back( new G4QStoppingPhysics(verboseLevel));
@@ -333 +314 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
-void PhysicsList::SetBuilderList2(G4bool)
+void PhysicsList::SetBuilderList2(G4bool addStopping)
 {
   hadronPhys.push_back( new G4EmExtraPhysics(verboseLevel));
   hadronPhys.push_back( new G4HadronElasticPhysicsLHEP(verboseLevel));
+  if(addStopping) { hadronPhys.push_back( new G4QStoppingPhysics(verboseLevel)); }
   hadronPhys.push_back( new G4IonPhysics(verboseLevel));
 }
@@ -342 +324 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 
-void PhysicsList::SetBuilderList3(G4bool)
+void PhysicsList::SetBuilderList3(const G4String& type)
 {
   hadronPhys.push_back( new G4EmExtraPhysics(verboseLevel));
-  hadronPhys.push_back( new G4HadronElasticPhysicsLHEP(verboseLevel));
+  if(type == "QBBC") {
+    RegisterPhysics( new G4HadronElasticPhysicsXS(verboseLevel) );
+  } else if(type == "QBBC_XGG") {
+    RegisterPhysics( new G4HadronElasticPhysics(verboseLevel) );
+  } else if(type == "QBBC_XGGSN") {
+    RegisterPhysics( new G4HadronElasticPhysics93(verboseLevel) );
+  } else if(type == "QBBC_HP") {
+    RegisterPhysics( new G4HadronElasticPhysicsHP(verboseLevel) );
+  }
   hadronPhys.push_back( new G4QStoppingPhysics(verboseLevel));
-  hadronPhys.push_back( new G4IonPhysics(verboseLevel));
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-
-void PhysicsList::SetBuilderList4(G4bool)
+  hadronPhys.push_back( new G4IonBinaryCascadePhysics(verboseLevel));
+  hadronPhys.push_back( new G4NeutronTrackingCut(verboseLevel));
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+
+void PhysicsList::SetBuilderList4()
 {
   hadronPhys.push_back( new G4EmExtraPhysics(verboseLevel));
@@ -358 +349 @@
   hadronPhys.push_back( new G4QStoppingPhysics(verboseLevel));
   hadronPhys.push_back( new G4IonPhysics(verboseLevel));
-  hadronPhys.push_back( new G4NeutronTrackingCut(verboseLevel));
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-
-void PhysicsList::SetBuilderList5(G4bool)
-{
-  hadronPhys.push_back( new G4EmExtraPhysics(verboseLevel));
-  hadronPhys.push_back( new G4HadronDElasticPhysics(verboseLevel));
-  hadronPhys.push_back( new G4QStoppingPhysics(verboseLevel));
-  hadronPhys.push_back( new G4IonBinaryCascadePhysics(verboseLevel));
-  hadronPhys.push_back( new G4NeutronTrackingCut(verboseLevel));
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
-
-void PhysicsList::SetBuilderList6(G4bool)
-{
-  hadronPhys.push_back( new G4EmExtraPhysics(verboseLevel));
-  hadronPhys.push_back( new G4HadronHElasticPhysics(verboseLevel));
-  hadronPhys.push_back( new G4QStoppingPhysics(verboseLevel));
-  hadronPhys.push_back( new G4IonBinaryCascadePhysics(verboseLevel));
   hadronPhys.push_back( new G4NeutronTrackingCut(verboseLevel));
 }
@@ -437 +406 @@
 void PhysicsList::List()
 {
-  G4cout << "### PhysicsLists available: FTFP_BERT FTFP_BERT_EMV FTFP_BERT_EMX FTFP_BERT_TRV FTF_BIC"
+  G4cout << "### PhysicsLists available: FTFP_BERT FTFP_BERT_EMV FTFP_BERT_EMX FTF_BIC"
          << G4endl;
   G4cout << "                            LHEP LHEP_EMV QBBC QBBC_XGG QBBC_XGGSN"
          << G4endl; 
-  G4cout << "                            QGSC_BERT QGSC_CHIPS QGSP_BERT QGSP_BERT_EMV QGSP_BIC_EMY"
+  G4cout << "                            QGSC_BERT QGSP_BERT QGSP_BERT_EMV QGSP_BIC_EMY"
          << G4endl; 
   G4cout << "                            QGSP_BERT_EMX QGSP_BERT_HP QGSP_BIC QGSP_BIC_HP"