Changeset 1342 for trunk/examples/extended/parameterisations/gflash/src

Timestamp:

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

Author:

garnier

Message:

update ti head

Location:

trunk/examples/extended/parameterisations/gflash/src

Files:

• ExGflashPhysicsList.cc (modified) (7 diffs)
• ExGflashSensitiveDetector.cc (modified) (3 diffs)

trunk/examples/extended/parameterisations/gflash/src/ExGflashPhysicsList.cc

@@ -35 +35 @@
 #include "G4Material.hh"
 #include "G4MaterialTable.hh"
+#include "G4Region.hh"
+#include "G4RegionStore.hh"
 #include "G4ios.hh"
 #include <iomanip>   
@@ -135 +137 @@
 #include "G4PhotoElectricEffect.hh"
 
-#include "G4MultipleScattering.hh"
+#include "G4eMultipleScattering.hh"
+#include "G4MuMultipleScattering.hh"
+#include "G4hMultipleScattering.hh"
 
 #include "G4eIonisation.hh"
@@ -179 +183 @@
     //electron
       // Construct processes for electron
-      G4VProcess* theeminusMultipleScattering = new G4MultipleScattering();
+      G4VProcess* theeminusMultipleScattering = new G4eMultipleScattering();
       G4VProcess* theeminusIonisation = new G4eIonisation();
       G4VProcess* theeminusBremsstrahlung = new G4eBremsstrahlung();
@@ -208 +212 @@
     //positron
       // Construct processes for positron
-      G4VProcess* theeplusMultipleScattering = new G4MultipleScattering();
+      G4VProcess* theeplusMultipleScattering = new G4eMultipleScattering();
       G4VProcess* theeplusIonisation = new G4eIonisation();
       G4VProcess* theeplusBremsstrahlung = new G4eBremsstrahlung();
@@ -236 +240 @@
     //muon  
      // Construct processes for muon+
-     G4VProcess* aMultipleScattering = new G4MultipleScattering();
+     G4VProcess* aMultipleScattering = new G4MuMultipleScattering();
      G4VProcess* aBremsstrahlung = new G4MuBremsstrahlung();
      G4VProcess* aPairProduction = new G4MuPairProduction();
@@ -258 +262 @@
               (particle->GetParticleName() != "chargedgeantino")) {
      // all others charged particles except geantino
-     G4VProcess* aMultipleScattering = new G4MultipleScattering();
+     G4VProcess* aMultipleScattering = new G4hMultipleScattering();
      G4VProcess* anIonisation = new G4hIonisation();
      // add processes
@@ -335 +339 @@
  
   DumpCutValuesTable();
-}
-
-
-
-
-
-
-
-
-
+// set cuts for region crystals with default Cuts
+  G4Region* region = G4RegionStore::GetInstance()->GetRegion("crystals");
+  region->SetProductionCuts(
+          G4ProductionCutsTable::GetProductionCutsTable()->GetDefaultProductionCuts());
+}
+
+
+
+
+
+
+
+
+

trunk/examples/extended/parameterisations/gflash/src/ExGflashSensitiveDetector.cc

@@ -58 +58 @@
 void ExGflashSensitiveDetector::EndOfEvent(G4HCofThisEvent*HCE)
 {
-        if (HCE);       
+        if (HCE){;}     
         // No Hadronic
         //    cout<<"IEndOfEvent  " << HCID << endl;
@@ -78 +78 @@
         caloHit->SetPos(aStep->GetPreStepPoint()->GetPosition());
         caloHitsCollection->insert(caloHit);
-        if (ROhist); 
+        if (ROhist){;} 
         G4VPhysicalVolume* physVol = theTouchable->GetVolume();
         G4int crystalnum=0;
@@ -102 +102 @@
         caloHit->SetPos(aSpot->GetEnergySpot()->GetPosition());
         caloHitsCollection->insert(caloHit);
-        if (ROhist); 
+        if (ROhist){;} 
         //cout <<pCurrentVolume->GetName()   << endl;
         G4int crystalnum=0;