X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TGeant4%2FTG4PhysicsConstructorSpecialCuts.cxx;h=0d876a5e8eb948f19c905bdb3652c62fb197406a;hb=e5967ab3e3a08627b4989bd01e711b45bf0584d5;hp=67a136ade8b92de808a74f3e07dccc51efc4b0ee;hpb=b94a914b126b8691c98d134056e2ae2138578582;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TGeant4/TG4PhysicsConstructorSpecialCuts.cxx b/TGeant4/TG4PhysicsConstructorSpecialCuts.cxx
index 67a136ade8b..0d876a5e8eb 100644
--- a/TGeant4/TG4PhysicsConstructorSpecialCuts.cxx
+++ b/TGeant4/TG4PhysicsConstructorSpecialCuts.cxx
@@ -1,17 +1,28 @@
 // $Id$
 // Category: physics
 //
+// Author: I. Hrivnacova
+//
+// Class TG4PhysicsConstructorSpecialCuts
+// --------------------------------------
 // See the class description in the header file.
 
 #include "TG4PhysicsConstructorSpecialCuts.h"
 #include "TG4G3PhysicsManager.h"
-#include "TG4SpecialCuts.h"
+#include "TG4SpecialCutsForGamma.h"
+#include "TG4SpecialCutsForElectron.h"
+#include "TG4SpecialCutsForEplus.h"
+#include "TG4SpecialCutsForChargedHadron.h"
+#include "TG4SpecialCutsForNeutralHadron.h"
+#include "TG4SpecialCutsForMuon.h"
+#include "TG4SpecialCutsForOther.h"
 
 #include <G4ParticleDefinition.hh>
 #include <G4ProcessManager.hh>
 #include <G4VProcess.hh>
 
 
+//_____________________________________________________________________________
 TG4PhysicsConstructorSpecialCuts::TG4PhysicsConstructorSpecialCuts(
                                      const G4String& name)
   : G4VPhysicsConstructor(name)
@@ -20,12 +31,14 @@ TG4PhysicsConstructorSpecialCuts::TG4PhysicsConstructorSpecialCuts(
   SetVerboseLevel(1);
 }
 
+//_____________________________________________________________________________
 TG4PhysicsConstructorSpecialCuts::~TG4PhysicsConstructorSpecialCuts() {
 //
 }
 
 // protected methods
 
+//_____________________________________________________________________________
 void TG4PhysicsConstructorSpecialCuts::ConstructParticle()
 {
 // The particles are constructed in the 
@@ -33,6 +46,7 @@ void TG4PhysicsConstructorSpecialCuts::ConstructParticle()
 // ---
 }
 
+//_____________________________________________________________________________
 void TG4PhysicsConstructorSpecialCuts::ConstructProcess()
 {
 // Adds TG4SpecialCuts "process" that activates
@@ -40,15 +54,11 @@ void TG4PhysicsConstructorSpecialCuts::ConstructProcess()
 // the vector of cuts (PhysicsManager::fCutVector) or in TG4Limits.
 // ---
 
-  TG4G3PhysicsManager* g3PhysicsManager 
-    = TG4G3PhysicsManager::Instance();
+  TG4G3PhysicsManager* g3PhysicsManager = TG4G3PhysicsManager::Instance();
 
   if (g3PhysicsManager->IsSpecialCuts())
   {
-    TG4G3CutVector* cutVector
-      = g3PhysicsManager->GetCutVector(); 
-    TG4boolVector* isCutVector 
-      = g3PhysicsManager->GetIsCutVector(); 
+    TG4boolVector* isCutVector = g3PhysicsManager->GetIsCutVector(); 
 
     theParticleIterator->reset();
     while ((*theParticleIterator)())
@@ -56,40 +66,60 @@ void TG4PhysicsConstructorSpecialCuts::ConstructProcess()
       G4ParticleDefinition* particle = theParticleIterator->value();
       TG4G3ParticleWSP particleWSP 
         = g3PhysicsManager->GetG3ParticleWSP(particle);
-      G4String name;
-      g3PhysicsManager->GetG3ParticleWSPName(particleWSP, name);
+      G4String name =
+        g3PhysicsManager->GetG3ParticleWSPName(particleWSP);
       
       // uncomment this to see all particles "WSP"
       //G4cout << "Iterating particle: " 
       //       << particle->GetParticleName() << " " << particleWSP << " "
       //       << name << G4endl;
 
-      // special process is created in case
-      // cutVector (vector of kinetic energy cuts) is set
-      // or the special cut is set by TG4Limits
       if ((particleWSP !=kNofParticlesWSP) && 
           ((*isCutVector)[particleWSP])) {
+        // special process is created in case
+        // cutVector (vector of kinetic energy cuts) is set
+        // or the special cut is set by TG4Limits
+  
         // check if process already exists
-	G4String processName = "specialCutFor" + name;
+        G4String processName = "specialCutFor" + name;
 	G4VProcess* process = g3PhysicsManager->FindProcess(processName);
 	if (!process) {
-          process = new TG4SpecialCuts(particleWSP, cutVector, processName);
-	}  
-        //particle->GetProcessManager()->AddProcess(process, 0, -1, 1);
+          switch (particleWSP) {
+            case kGamma:
+              process = new TG4SpecialCutsForGamma(processName);
+	      break;
+            case kElectron:
+              process = new TG4SpecialCutsForElectron(processName);
+	      break;
+            case kEplus:  
+              process = new TG4SpecialCutsForEplus(processName);
+	      break;
+            case kChargedHadron:  
+              process = new TG4SpecialCutsForChargedHadron(processName);
+	      break;
+            case kNeutralHadron:  
+              process = new TG4SpecialCutsForNeutralHadron(processName);
+	      break;
+            case kMuon:  
+              process = new TG4SpecialCutsForMuon(processName);
+	      break;
+            case kAny:
+              process = new TG4SpecialCutsForOther(processName);
+	      break;
+	  }  
+        }
+        // add process to particle
         particle->GetProcessManager()->AddDiscreteProcess(process);
       }
     }
 
     if (verboseLevel>0) {
-      G4cout << "TG4PhysicsList::ConstructSpecialCuts: " << G4endl;
-      if (cutVector)
-        G4cout << "   Global kinetic energy cuts are set." << G4endl;
-      G4cout << "   Special cuts process is defined for: " << G4endl 
-             << "   ";
+      G4cout << "###  Special Cuts constructed. " << G4endl;
+      G4cout << "     Special cuts process is defined for: " << G4endl 
+             << "     ";
       for (G4int i=0; i<kAny; i++) {
-        G4String name;
-        g3PhysicsManager->GetG3ParticleWSPName(i, name);
-        if ((*isCutVector)[i]) G4cout << name << " ";
+        if ((*isCutVector)[i]) 
+	  G4cout << g3PhysicsManager->GetG3ParticleWSPName(i) << " ";
       }  
       G4cout << G4endl;
     }