Added To SVN Repository

geant4/LEMuSR/include/LEMuSRDetectorConstruction.hh

@@ -135,7 +135,7 @@ public:
   G4VPhysicalVolume* Construct();
 
   //! Implementation of the detector construction procedure (cf. Construct).
-  /*! In this method the Wold volume or Labo is defined as a 2x2x2 m³ room. Then the different contruction methods are called and the sensitive detection for the scintillators, the MCP2 and the sample plate are defined (cf. Construct).
+  /*! In this method the Wold volume or Labo is defined as a 2x2x4 cubic meters room, which center defines the origin point (0 0 0) of the geometry. Then the different contruction methods are called and the sensitive detection for the scintillators, the MCP2 and the sample plate are defined.
 */  
   G4VPhysicalVolume* lemuDetector();
  
@@ -150,7 +150,7 @@ public:
 
 
 private:
- 
+  //!#anchor LEMUDETCOMPONENTS 
   //=======LABORATORY::WORLD=================
   
   // solid
@@ -429,9 +429,9 @@ private:
 
 
   // logical
-  G4LogicalVolume *lv_Trigger, *lv_TriggerF, *lv_TriggerV, *lv_TriggerB, *lv_TriggerB2, *lv_TriggerB3, *lv_CFOIL;
+  G4LogicalVolume *lv_Trigger, *lv_TriggerF, *lv_TriggerV, *lv_TriggerE, *lv_TriggerE2, *lv_TriggerE3, *lv_CFOIL;
   // physica.l
-  G4VPhysicalVolume *pv_Trigger, *pv_TriggerF1, *pv_TriggerF2,*pv_TriggerV, *pv_TriggerB, *pv_TriggerB2, *pv_TriggerB3, *pv_CFOIL;
+  G4VPhysicalVolume *pv_Trigger, *pv_TriggerF1, *pv_TriggerF2,*pv_TriggerV, *pv_TriggerE, *pv_TriggerE2, *pv_TriggerE3, *pv_CFOIL;
 
 
  //================ COMPENSATION GATE ====================
@@ -522,6 +522,7 @@ public:
 
   //====== MATERIAL DECLARATION  =========================
 private:
+  //!\anchor mat_def
   //! Declaration of materials
   /*! This method contains the definition of all elements and materials and builds the materials table. It is important to call this method in the contructor because the materials table should be built only once. If this method was called in the Construct method, each modification of the detector would lead to an additional materials table. The consequence is a severe conflict causing a segmentation fault.*/
   void MaterialsDefinition();
@@ -587,7 +588,7 @@ public:
   G4Material* VTBB_material;
 
 
-
+  G4String FieldMapsDir;
 
 
   // print STATUS

geant4/LEMuSR/include/LEMuSRElectricField.hh

@@ -25,7 +25,9 @@
  * COMSOL Multiphysics. 
  * \image html field.gif Example of a field map generated using COMSOL.
  * Those field maps are shared into three ascii files, one per field component, 
- * in the format (x y z B_i). 
+ * in the format (x y z B_i). The first line in the file contains 
+ * the labels. The second line is  (x_min y_min z_min B_i) and the last line
+ * is  (x_max y_max z_max B_i).
  * LEMuSRElectricField reads those files and store them in an array.
  * Some important parameters must be specified to read a field map:
  * -# <b> The number of points</b> along each axis which was  defined in COMSOL 
@@ -37,7 +39,7 @@
  *    - A different unit has an influence
  * on the coordinates reading, but also on the actual field value which has to
  * be scaled consequently.
- * -# The voltage to use because field maps are calculated for 1kV potential. 
+ * -# The voltage to use. Indeed,the field maps are generated for 1kV potential.
  * The user should indicate the actual voltage to multiply the fields values.
  * -# The offset along z axis, in case the map is not centered on the actual
  * postition of the field. This is the case for the third lense field for example:
@@ -45,7 +47,8 @@
  * .
  * The field maps can be very heavy files and reading them can cost a lot of time.
  * For this reason, it is possible to write the field map array in a single file
- * after the first reading. 
+ * after the first reading. Such maps files have been produced for the third 
+ * lens, the anode and the sample. 
  */
 
 #ifndef LEMUSRELECTRICFIELD_H
@@ -71,13 +74,13 @@ class LEMuSRElectricField : public G4ElectricField
 public:
  
   //! Constructor from three field maps
-  LEMuSRElectricField(G4double fieldval,const char* Xfile, 
-		      const char* Yfile,
-		      const char* Zfile,G4String map_length_unit,
+  LEMuSRElectricField(G4double fieldval,G4String Xfile, 
+		      G4String Yfile,
+		      G4String Zfile,G4String map_length_unit,
 		      G4double Offset, G4double nx, G4double ny, G4double nz);//offset must be entered in millimeter
   
   //! Contructor from a single field map
-  LEMuSRElectricField(G4double fieldval,const char* file,G4String map_length_unit,	
+  LEMuSRElectricField(G4double fieldval,G4String file,G4String map_length_unit,	
 		      G4double Offset, G4double nx, G4double ny, G4double nz);
   
   

geant4/LEMuSR/include/LEMuSRParticleGun.hh

@@ -65,7 +65,6 @@ protected:
  private:
   //! Messenger
      LEMuSRParticleGunMessenger* theMessenger;
-     G4ParticleGunMessenger* Messenger;
 
 };
 

geant4/LEMuSR/include/LEMuSRRunAction.hh

@@ -40,7 +40,9 @@
 #include "TTree.h"
 #include "TBranch.h"
 
-
+#include "G4VPhysicalVolume.hh"
+// LEMuSR
+#include "LEMuSRDetectorConstruction.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......