Fixed Bugs

geant4/LEMuSR/include/LEMuSRCryoSD.hh

@@ -146,8 +146,27 @@ typedef struct
   Int_t muon,positron,gamma, runid;
 } cryoHit ;
 
+
+typedef struct
+{
+
+  Int_t muon,positron,gamma, runid;
+
+} particleHit ;
+
+
+typedef struct
+{
+  Int_t grid, guards, mcp, cryo;
+  Float_t RAL, RAR, L3, TDet1, TDet2, TDet3;
+  Float_t Bmag;
+} detectorData ;
+
   //! Root hit object.
   cryoHit theHit;
+  particleHit theParticle;
+  detectorData detector;
+
 
   //! Filling the Root hit object.
   /*!

geant4/LEMuSR/include/LEMuSRIonPhysics.hh

@@ -1,80 +0,0 @@
-// ------------------------------------------- 
-//	History
-//        first version                   12 Nov. 2000 by H.Kurashige 
-// ------------------------------------------------------------
-#ifndef LEMuSRIonPhysics_h
-#define LEMuSRIonPhysics_h 1
-
-#include "globals.hh"
-#include "G4ios.hh"
-
-#include "G4VPhysicsConstructor.hh"
-
-#include "G4HadronElasticProcess.hh"
-#include "G4LElastic.hh"
-
-#include "G4DeuteronInelasticProcess.hh"
-#include "G4LEDeuteronInelastic.hh"
-
-#include "G4TritonInelasticProcess.hh"
-#include "G4LETritonInelastic.hh"
-
-#include "G4AlphaInelasticProcess.hh"
-#include "G4LEAlphaInelastic.hh"
-
-#include "G4hIonisation.hh"
-#include "G4ionIonisation.hh"
-#include "G4MultipleScattering.hh"
-
-class LEMuSRIonPhysics : public G4VPhysicsConstructor
-{
-  public: 
-    LEMuSRIonPhysics(const G4String& name="ion");
-    virtual ~LEMuSRIonPhysics();
-
-  public: 
-    // This method will be invoked in the Construct() method. 
-    // each particle type will be instantiated
-    virtual void ConstructParticle();
- 
-    // This method will be invoked in the Construct() method.
-    // each physics process will be instantiated and
-    // registered to the process manager of each particle type 
-    virtual void ConstructProcess();
-
-  protected:
-   // Elastic Process
-   G4HadronElasticProcess      theElasticProcess;
-   G4LElastic*                 theElasticModel;
-
-   // Generic Ion physics
-   G4MultipleScattering        fIonMultipleScattering;
-   G4ionIonisation             fIonIonisation;
-
-   // Deuteron physics
-   G4MultipleScattering        fDeuteronMultipleScattering;
-   G4hIonisation               fDeuteronIonisation;
-   G4DeuteronInelasticProcess  fDeuteronProcess;
-   G4LEDeuteronInelastic*      fDeuteronModel;
-
-   // Triton physics
-   G4MultipleScattering        fTritonMultipleScattering;
-   G4hIonisation               fTritonIonisation;
-   G4TritonInelasticProcess    fTritonProcess;
-   G4LETritonInelastic*        fTritonModel;
-  
-   // Alpha physics
-   G4MultipleScattering        fAlphaMultipleScattering;
-   G4hIonisation               fAlphaIonisation;
-   G4AlphaInelasticProcess     fAlphaProcess;
-   G4LEAlphaInelastic*         fAlphaModel;
-
-   // He3 physics
-   G4MultipleScattering        fHe3MultipleScattering;
-   G4hIonisation               fHe3Ionisation;
-
-};
-
-
-#endif
-

geant4/LEMuSR/include/LEMuSRMSC.hh

@@ -64,7 +64,7 @@
 #include "G4GPILSelection.hh"
 #include "G4PhysicsLogVector.hh"
 #include "G4VPhysicalVolume.hh"
-#include "G4ParticleChangeForMSC.hh"
+#include "LEMuSRParticleChangeForMSC.hh"
 #include "G4UnitsTable.hh"
 #include "G4MaterialCutsCouple.hh"
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -212,7 +212,7 @@ class LEMuSRMSC : public G4VContinuousDiscreteProcess
    G4double NuclCorrPar;
    G4double FactPar;
 
-   G4ParticleChangeForMSC fParticleChange; 
+   LEMuSRParticleChangeForMSC fParticleChange; 
 
    G4double alfa1,alfa2,alfa3,b,xsi,c0,facxsi ;    // angle distr. parameters
                                                  // facxsi : some tuning 

geant4/LEMuSR/include/LEMuSRMagneticField.hh

@@ -20,11 +20,11 @@
 //                               Magnetic Field   
 //$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$//
 
-#include "G4UniformMagField.hh"
+#include "G4MagneticField.hh"
 #include"G4ThreeVector.hh"
 #include"G4ios.hh"
 
-class LEMuSRMagneticField : public G4UniformMagField
+class LEMuSRMagneticField : public G4MagneticField
 {
 public: 
 

geant4/LEMuSR/include/LEMuSRStackingAction.hh

@@ -64,7 +64,12 @@ private:
 
   
 public:
-  /*    inline void SetNRequestMuon(G4int val) { reqMuon = val; }
+  G4bool kill_e, kill_gamma, kill_nu_e, kill_nu_mu;
+
+  void KillUnwanted();
+
+
+ /*    inline void SetNRequestMuon(G4int val) { reqMuon = val; }
 	inline G4int GetNRequestMuon() const { return reqMuon; }
 	inline void SetNRequestIsoMuon(G4int val) { reqIsoMuon = val; }
 	inline G4int GetNRequestIsoMuon() const { return reqIsoMuon; }

geant4/LEMuSR/include/LEMuSRStackingActionMessenger.hh

@@ -25,8 +25,30 @@
 #define LEMuSRStackingActionMessenger_h 1
 
 class LEMuSRStackingAction;
-class G4UIcmdWithAnInteger;
+
+#include "G4UIdirectory.hh"
+#include "G4UIcmdWith3VectorAndUnit.hh"
+#include "G4UIcmdWith3Vector.hh"
+#include "G4UIcmdWithADoubleAndUnit.hh"
+#include "G4UIcmdWithAString.hh"
+#include "G4UIcmdWithADouble.hh"
+
+#include "G4UIcmdWithAnInteger.hh"
+#include "G4UIcmdWithoutParameter.hh"
+#include "G4UIcommand.hh"
+#include "G4UImanager.hh"
+#include "G4UIterminal.hh"
+#include "G4UItcsh.hh"
+
+class G4UIcommand;
+class G4UIdirectory;
+class G4UIcmdWithADouble;
 class G4UIcmdWithADoubleAndUnit;
+class G4UIcmdWith3VectorAndUnit;
+class G4UIcmdWith3Vector;
+class G4UIcmdWithAnInteger;
+class G4UIcmdWithAString;
+class G4UIcmdWithoutParameter;
 
 #include "G4UImessenger.hh"
 #include "globals.hh"
@@ -49,12 +71,13 @@ class LEMuSRStackingActionMessenger: public G4UImessenger
     LEMuSRStackingAction * myAction;
     
   private: //commands
-  /*    G4UIcmdWithAnInteger * muonCmd;
-    G4UIcmdWithAnInteger * isomuonCmd;
-    G4UIcmdWithAnInteger * isoCmd;
-    G4UIcmdWithADoubleAndUnit * roiCmd;
+  /*   
+       G4UIcmdWithAnInteger * muonCmd;
+       G4UIcmdWithAnInteger * isomuonCmd;
+       G4UIcmdWithAnInteger * isoCmd;
+       G4UIcmdWithADoubleAndUnit * roiCmd;
   */
-    
+  
 };
 
 #endif

geant4/LEMuSR/include/LEMuSRTrack.hh

@@ -1,11 +0,0 @@
-#include "G4Track.hh"
-#include "G4DynamicParticle.hh"
-
-class LEMuSRTrack : public G4Track
-{
-
-public:
-  void  SetDynamicParticle(G4DynamicParticle );
-
-
-};