Import Geant4 10.0.0 source tree

examples/advanced/human_phantom/include/G4BasePhantomBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -46,13 +46,11 @@ public:
  
   virtual void BuildHead(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildTrunk(const G4String&,G4bool,G4bool) {return ;};
-  virtual void BuildLegs(const G4String&,G4bool,G4bool) {return ;};
-  virtual void BuildNeck(const G4String&,G4bool,G4bool) {return ;};
+  virtual void BuildLeftLeg(const G4String&,G4bool,G4bool) {return ;};
+  virtual void BuildRightLeg(const G4String&,G4bool,G4bool) {return ;};
 
   virtual void BuildUpperSpine(const G4String&,G4bool,G4bool) {return ;}
   virtual void BuildMiddleLowerSpine(const G4String&,G4bool,G4bool) {return ;};
-  virtual void BuildLeftLeg(const G4String&,G4bool,G4bool) {return ;};
-  virtual void BuildRightLeg(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildLeftLegBone(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildRightLegBone(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildLeftArmBone(const G4String&,G4bool,G4bool) {return ;}
@@ -60,20 +58,19 @@ public:
   virtual void BuildSkull(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildRibCage(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildPelvis(const G4String&,G4bool,G4bool) {return ;};
+  virtual void BuildLeftScapula(const G4String&,G4bool,G4bool){return;};
+  virtual void BuildRightScapula(const G4String&,G4bool,G4bool){return;};
+  virtual void BuildLeftClavicle(const G4String&,G4bool,G4bool){return;};
+  virtual void BuildRightClavicle(const G4String&,G4bool,G4bool){return;};
  
-
- //virtual void BuildScapulae(G4bool,G4bool) = 0;
-  //virtual void BuildClavicles(G4bool,G4bool) = 0;
-
   virtual void BuildBrain(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildHeart(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildLeftLung(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildRightLung(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildStomach(const G4String&,G4bool,G4bool) {return ;};
+  virtual void BuildSmallIntestine(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildUpperLargeIntestine(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildLowerLargeIntestine(const G4String&,G4bool,G4bool) {return ;};
-  // virtual void BuildEsophagus(G4bool,G4bool) = 0;
-
   virtual void BuildLeftKidney(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildRightKidney(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildLeftAdrenal(const G4String&,G4bool,G4bool) {return ;};
@@ -83,20 +80,21 @@ public:
   virtual void BuildSpleen(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildUrinaryBladder(const G4String& ,G4bool,G4bool) {return ;};
   virtual void BuildThyroid(const G4String&,G4bool,G4bool) {return ;};
-  virtual void BuildLeftScapula(const G4String&,G4bool,G4bool){return;};
-  virtual void BuildRightScapula(const G4String&,G4bool,G4bool){return;};
-  virtual void SetModel(G4String) {return ;};
-  virtual void SetMotherVolume(G4VPhysicalVolume*) {return;};
-  virtual G4VPhysicalVolume* GetPhantom() {return 0;};
-
+  virtual void BuildThymus(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildLeftOvary(const G4String&,G4bool,G4bool ) {return ;};
-  
   virtual void BuildRightOvary(const G4String&,G4bool,G4bool) {return ;};
   virtual void BuildUterus(const G4String&,G4bool,G4bool){return;};
   virtual void BuildLeftBreast(const G4String&,G4bool,G4bool){return;};
   virtual void BuildRightBreast(const G4String&,G4bool,G4bool){return;};
   virtual void BuildVoxelLeftBreast(const G4String&,G4bool,G4bool){return;};
   virtual void BuildVoxelRightBreast(const G4String&,G4bool,G4bool){return;};
+  virtual void BuildMaleGenitalia(const G4String&,G4bool,G4bool){return;};
+  virtual void BuildLeftTeste(const G4String&,G4bool,G4bool){return;};
+  virtual void BuildRightTeste(const G4String&,G4bool,G4bool){return;};
+
+  virtual void SetModel(G4String) {return ;};
+  virtual void SetMotherVolume(G4VPhysicalVolume*) {return;};
+  virtual G4VPhysicalVolume* GetPhantom() {return 0;};
 
 };
 #endif

examples/advanced/human_phantom/include/G4CustomFemaleBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4FemaleBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4HumanDummyLeftBreastSD.hh

@@ -29,7 +29,7 @@
 //    *                              *
 //    ********************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4HumanDummyRightBreastSD.hh

@@ -29,7 +29,7 @@
 //    *                              *
 //    ********************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4HumanPhantomActionInitialization.hh

@@ -0,0 +1,48 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+// Author: S. Guatelli, susanna@uow.edu.au
+//
+#ifndef G4HumanPhantomActionInitialization_h
+#define G4HumanPhantomActionInitialization_h 1
+
+#include "G4VUserActionInitialization.hh"
+#include "G4HumanPhantomAnalysisManager.hh"
+
+class G4HumanPhantomAnalysisManager;
+
+class G4HumanPhantomActionInitialization: public G4VUserActionInitialization
+{
+  public:
+    G4HumanPhantomActionInitialization();
+    virtual ~G4HumanPhantomActionInitialization();
+
+    virtual void BuildForMaster() const;
+    virtual void Build() const;
+};
+
+#endif
+
+    

examples/advanced/human_phantom/include/G4HumanPhantomAnalysisManager.hh

@@ -23,37 +23,51 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
-// 
-// Based on code developed by the undergraduate student G. Guerrieri 
-// Note: this is a preliminary beta-version of the code; an improved 
-// version will be distributed in the next Geant4 public release, compliant
-// with the design in a forthcoming publication, and subject to a 
-// design and code review.
-//
 
-#ifndef G4HumanPhantomPrimaryGeneratorMessenger_h
-#define G4HumanPhantomPrimaryGeneratorMessenger_h 1
+#ifndef G4HumanPhantomAnalysisManager_HH
+#define G4HumanPhantomAnalysisManager_HH
 
-#include "G4UImessenger.hh"
 #include "globals.hh"
+#include "g4root.hh"
 
-class G4HumanPhantomPrimaryGeneratorAction;
+/*
+Author: Susanna Guatelli
 
-class G4UIcmdWithAString;
+The class G4HumanPhantomAnalysisManager creates and manages ntuples
 
-class G4HumanPhantomPrimaryGeneratorMessenger: public G4UImessenger
+This class was developed following the extended Geant4 example analysis/AnaEx01
+
+1 ntuple is created.
+*/
+
+// Define the total number of columns in the ntuple
+const G4int MaxNtCol = 2;
+
+class G4HumanPhantomAnalysisManager
 {
-  public:
-  G4HumanPhantomPrimaryGeneratorMessenger(G4HumanPhantomPrimaryGeneratorAction*);
-  ~G4HumanPhantomPrimaryGeneratorMessenger();
-  
-  void SetNewValue(G4UIcommand*, G4String);
-  
-private:
-  G4HumanPhantomPrimaryGeneratorAction*    primary; 
-  G4UIcmdWithAString*               beamCmd;
-};
 
+public:
+  G4HumanPhantomAnalysisManager();
+  ~G4HumanPhantomAnalysisManager();
+  
+
+  void book();
+  // Create the output ROOT file 
+  // Create the ntuple and histograms
+
+  void FillNtupleWithEnergyDeposition(G4int,G4double);
+  // Method to fill the ntuple with the energy deposition, integrated over a run, 
+  // in each organ identified with an integer
+
+  void save();
+ // This method if called at the end of the run to store the 
+ // results in the ROOT file
+
+private:
+    G4bool factoryOn; 
+    G4int         fNtColId[MaxNtCol];
+};
 #endif
 
+
+

examples/advanced/human_phantom/include/G4HumanPhantomColour.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4HumanPhantomConstruction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -53,7 +53,7 @@ class G4HumanPhantomConstruction : public G4VUserDetectorConstruction
 
   void SetPhantomSex(G4String);
   void SetPhantomModel(G4String);
-
+  void ConstructSDandField();
   //G4VPhysicalVolume* GetMotherVolume(){return mother;};
  
  private:

examples/advanced/human_phantom/include/G4HumanPhantomEventAction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4HumanPhantomHit.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4HumanPhantomHit.hh 76254 2013-11-08 11:27:57Z gcosmo $
 //
 
 #ifndef G4HumanPhantomHit_h
@@ -34,6 +34,7 @@
 #include "G4THitsCollection.hh"
 #include "G4Allocator.hh"
 #include "G4ThreeVector.hh"
+#include "tls.hh" // FOR MT
 
 class G4HumanPhantomHit : public G4VHit
 {
@@ -65,18 +66,18 @@ private:
 
 typedef G4THitsCollection<G4HumanPhantomHit> G4HumanPhantomHitsCollection;
 
-extern G4Allocator<G4HumanPhantomHit> G4HumanPhantomHitAllocator;
+extern G4ThreadLocal G4Allocator<G4HumanPhantomHit>* G4HumanPhantomHitAllocator;
 
 inline void* G4HumanPhantomHit::operator new(size_t)
 {
-  void *aHit;
-  aHit = (void *) G4HumanPhantomHitAllocator.MallocSingle();
-  return aHit;
+  if(!G4HumanPhantomHitAllocator)
+      G4HumanPhantomHitAllocator = new G4Allocator<G4HumanPhantomHit>;
+  return (void *) G4HumanPhantomHitAllocator->MallocSingle();
 }
 
 inline void G4HumanPhantomHit::operator delete(void *aHit)
 {
-  G4HumanPhantomHitAllocator.FreeSingle((G4HumanPhantomHit*) aHit);
+  G4HumanPhantomHitAllocator -> FreeSingle((G4HumanPhantomHit*) aHit);
 }
 
 #endif

examples/advanced/human_phantom/include/G4HumanPhantomMaterial.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4HumanPhantomMessenger.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4HumanPhantomPhysicsList.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4HumanPhantomPhysicsList.hh 70025 2013-05-22 08:43:05Z gcosmo $
 //
 // Authors: S. Guatelli, G. Guerrieri and M. G. Pia 
 //
@@ -37,10 +37,10 @@
 #ifndef G4HumanPhantomPhysicsList_h
 #define G4HumanPhantomPhysicsList_h 1
 
-#include "G4VUserPhysicsList.hh"
+#include "G4VModularPhysicsList.hh"
 #include "globals.hh"
 
-class G4HumanPhantomPhysicsList: public G4VUserPhysicsList
+class G4HumanPhantomPhysicsList: public G4VModularPhysicsList
 {
 public:
   G4HumanPhantomPhysicsList();
@@ -50,17 +50,11 @@ protected:
   // Construct particle and physics
   void ConstructParticle();
   void ConstructProcess();
-  void ConstructBosons();
-  void ConstructLeptons();
-
   void SetCuts();
 
 private:
-
-  // These methods construct physics processes and register them
-  void ConstructEM();
+  G4VPhysicsConstructor* emPhysicsList;
 };
-
 #endif
 
 

examples/advanced/human_phantom/include/G4HumanPhantomPrimaryGeneratorAction.hh

@@ -23,14 +23,8 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
-// Based on code developed by the undergraduate student G. Guerrieri 
-// Note: this is a preliminary beta-version of the code; an improved 
-// version will be distributed in the next Geant4 public release, compliant
-// with the design in a forthcoming publication, and subject to a 
-// design and code review.
-//
 #ifndef G4HumanPhantomPrimaryGeneratorAction_h
 #define G4HumanPhantomPrimaryGeneratorAction_h 1
 
@@ -38,9 +32,7 @@
 #include "globals.hh"
 #include <vector>
 
-//class G4HumanPhantomConstruction;
-class G4HumanPhantomPrimaryGeneratorMessenger;
-class G4ParticleGun;
+class G4GeneralParticleSource;
 class G4Event;
 
 class G4HumanPhantomPrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
@@ -51,27 +43,10 @@ class G4HumanPhantomPrimaryGeneratorAction : public G4VUserPrimaryGeneratorActio
 
   public:
     void GeneratePrimaries(G4Event* anEvent);
-    void GenerateBeamAlongZ();
-    void GenerateBeamAlongX();
-    void GenerateBeamAlongY();
-    void GenerateIsotropicFlux();
-    void SetBeam(G4String);
 
   private:
-    G4ParticleGun* particleGun;
-
-    G4double x0;
-    G4double y0;
-    G4double z0;
-    
-    std::vector<G4double> probability;
-   
-    G4HumanPhantomPrimaryGeneratorMessenger* messenger;
-    
-    G4String beamKind;
-    G4double worldLength;
+    G4GeneralParticleSource* particleGun;
 };
-
 #endif
 
 

examples/advanced/human_phantom/include/G4HumanPhantomRunAction.hh

@@ -23,13 +23,8 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
-// Based on code developed by the undergraduate student G. Guerrieri 
-// Note: this is a preliminary beta-version of the code; an improved 
-// version will be distributed in the next Geant4 public release, compliant
-// with the design in a forthcoming publication, and subject to a 
-// design and code review.
 //
 
 #ifndef G4HumanPhantomRunAction_h
@@ -37,12 +32,13 @@
 
 #include "G4UserRunAction.hh"
 #include "globals.hh"
+#include "G4HumanPhantomAnalysisManager.hh"
 #include <map>
 
 class G4HumanPhantomRunAction : public G4UserRunAction
 {
   public:
-    G4HumanPhantomRunAction();
+    G4HumanPhantomRunAction(G4HumanPhantomAnalysisManager* analysis);
    ~G4HumanPhantomRunAction();
 
   public:
@@ -54,6 +50,9 @@ private:
     std::map<std::string,G4double> energyTotal;
     G4String bodypartName;
 
+#ifdef ANALYSIS_USE
+    G4HumanPhantomAnalysisManager* analysisMan;
+#endif
 };
 #endif
 

examples/advanced/human_phantom/include/G4HumanPhantomSD.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -42,7 +42,8 @@ class G4Step;
 class G4HumanPhantomSD : public G4VSensitiveDetector
 {
   public:
-      G4HumanPhantomSD(G4String);
+      G4HumanPhantomSD(const G4String& name, 
+                       const G4String& hitsCollectionName);
      ~G4HumanPhantomSD();
 
       void Initialize(G4HCofThisEvent*);

examples/advanced/human_phantom/include/G4HumanPhantomSteppingAction.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4MIRDBodyFactory.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -49,7 +49,8 @@ public:
  ~G4MIRDBodyFactory();
   G4VPhysicalVolume* CreateOrgan(const G4String&, G4VPhysicalVolume*, 
 				 const G4String&,G4bool,G4bool);
- 
+
+
 private:
   std::map<std::string,G4VOrgan*> organ; 
 };

examples/advanced/human_phantom/include/G4MIRDBrain.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -48,5 +48,6 @@ public:
   ~G4MIRDBrain();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDHead.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -39,7 +39,7 @@
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
-class G4HumanPhantomMaterial;
+class MarsMaterial;
 
 class G4MIRDHead: public G4VOrgan
 {
@@ -49,8 +49,5 @@ public:
   ~G4MIRDHead();
   G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*, const G4String&, 
 				    G4bool, G4bool); 
-private:
-
-  G4HumanPhantomMaterial* material;
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDHeart.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -38,6 +38,7 @@
 #include "G4VOrgan.hh"
 class G4VPhysicalVolume;
 class G4LogicalVolume;
+class MarsMaterial;
 
 class G4MIRDHeart:public G4VOrgan
 {

examples/advanced/human_phantom/include/G4MIRDLeftAdrenal.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDLeftAdrenal();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
 				    const G4String&,G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftArmBone.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4MIRDLeftBreast.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -48,5 +48,6 @@ public:
   ~G4MIRDLeftBreast();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftClavicle.hh

@@ -0,0 +1,52 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
+// 
+// Based on code developed by the undergraduate student G. Guerrieri 
+// Note: this is a preliminary beta-version of the code; an improved 
+// version will be distributed in the next Geant4 public release, compliant
+// with the design in a forthcoming publication, and subject to a 
+// design and code review.
+//
+#ifndef G4MIRDLeftClavicle_h
+#define G4MIRDLeftClavicle_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDLeftClavicle:public G4VOrgan
+{
+public:
+
+  G4MIRDLeftClavicle();
+  ~G4MIRDLeftClavicle();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
+private:
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDLeftKidney.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDLeftKidney();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
 				    const G4String&,G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftLeg.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDLeftLeg();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftLegBone.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDLeftLegBone();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftLung.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -49,5 +49,6 @@ public:
   G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*, 
 				    const G4String&,G4bool, G4bool);
 
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftOvary.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -48,5 +48,6 @@ public:
   G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
 
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftScapula.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDLeftScapula();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftTeste.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -31,20 +31,23 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
+#ifndef G4MIRDLeftTeste_h
+#define G4MIRDLeftTeste_h 1
 
-#ifndef G4VoxelRightBreastROGeometry_h
-#define G4VoxelRightBreastROGeometry_h 
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
-#include "G4VReadOutGeometry.hh"
+class G4VPhysicalVolume;
 
-class G4VoxelRightBreastROGeometry : public G4VReadOutGeometry
+class G4MIRDLeftTeste: public G4VOrgan
 {
 public:
-  G4VoxelRightBreastROGeometry(G4String aString);
-  ~G4VoxelRightBreastROGeometry();
+
+  G4MIRDLeftTeste();
+  ~G4MIRDLeftTeste();
+  G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
 
 private:
-  G4VPhysicalVolume* Build();
-  G4VPhysicalVolume* ROvoxel_phys;
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLiver.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
 
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLowerLargeIntestine.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDLowerLargeIntestine();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
 				    const G4String&, G4bool, G4bool);
+private:
  };
 #endif

examples/advanced/human_phantom/include/G4MIRDMaleGenitalia.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -31,20 +31,23 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
+#ifndef G4MIRDMaleGenitalia_h
+#define G4MIRDMaleGenitalia_h 1
 
-#ifndef G4VoxelLeftBreastROGeometry_h
-#define G4VoxelLeftBreastROGeometry_h 
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
-#include "G4VReadOutGeometry.hh"
+class G4VPhysicalVolume;
 
-class G4VoxelLeftBreastROGeometry : public G4VReadOutGeometry
+class G4MIRDMaleGenitalia: public G4VOrgan
 {
 public:
-  G4VoxelLeftBreastROGeometry(G4String aString);
-  ~G4VoxelLeftBreastROGeometry();
+
+  G4MIRDMaleGenitalia();
+  ~G4MIRDMaleGenitalia();
+  G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
 
 private:
-  G4VPhysicalVolume* Build();
-  G4VPhysicalVolume* ROvoxel_phys;
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDMiddleLowerSpine.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -48,7 +48,6 @@ public:
   ~G4MIRDMiddleLowerSpine();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
- 
 private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDPancreas.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -48,5 +48,6 @@ public:
   ~G4MIRDPancreas();
   G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*, 
                                const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDPelvis.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDPelvis();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRibCage.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -50,17 +50,17 @@ public:
 				    const G4String&, G4bool, G4bool);
 
 private:
-G4VPhysicalVolume* physRib1;
-G4VPhysicalVolume* physRib2;
-G4VPhysicalVolume* physRib3;
-G4VPhysicalVolume* physRib4;
-G4VPhysicalVolume* physRib5;
-G4VPhysicalVolume* physRib6;
-G4VPhysicalVolume* physRib7;
-G4VPhysicalVolume* physRib8;
-G4VPhysicalVolume* physRib9;
-G4VPhysicalVolume* physRib10;
-G4VPhysicalVolume* physRib11;
-G4VPhysicalVolume* physRib12;
+  G4VPhysicalVolume* physRib1;
+  G4VPhysicalVolume* physRib2;
+  G4VPhysicalVolume* physRib3;
+  G4VPhysicalVolume* physRib4;
+  G4VPhysicalVolume* physRib5;
+  G4VPhysicalVolume* physRib6;
+  G4VPhysicalVolume* physRib7;
+  G4VPhysicalVolume* physRib8;
+  G4VPhysicalVolume* physRib9;
+  G4VPhysicalVolume* physRib10;
+  G4VPhysicalVolume* physRib11;
+  G4VPhysicalVolume* physRib12;
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightAdrenal.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDRightAdrenal();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
 				    const G4String&,G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightArmBone.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4MIRDRightBreast.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -48,5 +48,6 @@ public:
   ~G4MIRDRightBreast();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&,G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightClavicle.hh

@@ -0,0 +1,52 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
+// 
+// Based on code developed by the undergraduate student G. Guerrieri 
+// Note: this is a preliminary beta-version of the code; an improved 
+// version will be distributed in the next Geant4 public release, compliant
+// with the design in a forthcoming publication, and subject to a 
+// design and code review.
+//
+#ifndef G4MIRDRightClavicle_h
+#define G4MIRDRightClavicle_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDRightClavicle:public G4VOrgan
+{
+public:
+
+  G4MIRDRightClavicle();
+  ~G4MIRDRightClavicle();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
+private:
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDRightKidney.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDRightKidney();
   G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*,  
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightLeg.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDRightLeg();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&,G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightLegBone.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -48,5 +48,6 @@ public:
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
 
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightLung.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -49,5 +49,6 @@ public:
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
 				    const G4String&, G4bool, G4bool);
 
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightOvary.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -49,5 +49,6 @@ public:
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,  
 				    const G4String&,G4bool, G4bool);
 
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightScapula.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDRightScapula();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightTeste.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -31,23 +31,24 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4VoxelLeftBreastSD_h
-#define G4VoxelLeftBreastSD_h 1
+#ifndef G4MIRDRightTeste_h
+#define G4MIRDRightTeste_h 1
 
-#include "G4VSensitiveDetector.hh"
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
-//class G4Step;
-//class G4HCofThisEvent;
+class G4VPhysicalVolume;
+class G4LogicalVolume;
 
-class G4VoxelLeftBreastSD : public G4VSensitiveDetector
+class G4MIRDRightTeste: public G4VOrgan
 {
-  public:
-      G4VoxelLeftBreastSD(G4String);
-     ~G4VoxelLeftBreastSD();
+public:
 
-      void Initialize(G4HCofThisEvent*);
-      G4bool ProcessHits(G4Step*, G4TouchableHistory*);
-      void EndOfEvent(G4HCofThisEvent*);
+  G4MIRDRightTeste();
+  ~G4MIRDRightTeste();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,  
+				    const G4String&,G4bool, G4bool);
+
+private:
 };
 #endif
-

examples/advanced/human_phantom/include/G4MIRDSkull.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,8 +47,6 @@ public:
   ~G4MIRDSkull();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
- 
 private:
-
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDSmallIntestine.hh

@@ -0,0 +1,52 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
+// 
+// Based on code developed by the undergraduate student G. Guerrieri 
+// Note: this is a preliminary beta-version of the code; an improved 
+// version will be distributed in the next Geant4 public release, compliant
+// with the design in a forthcoming publication, and subject to a 
+// design and code review.
+//
+#ifndef G4MIRDSmallIntestine_h
+#define G4MIRDSmallIntestine_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDSmallIntestine: public G4VOrgan
+{
+public:
+
+  G4MIRDSmallIntestine();
+  ~G4MIRDSmallIntestine();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
+				    const G4String&, G4bool, G4bool);
+private:
+ };
+#endif

examples/advanced/human_phantom/include/G4MIRDSpleen.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -49,5 +49,6 @@ public:
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,  
 				    const G4String&, G4bool, G4bool);
  
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDStomach.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -48,5 +48,6 @@ public:
   ~G4MIRDStomach();
   G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*,
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDThymus.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -31,21 +31,24 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4MIRDTestes_h
-#define G4MIRDTestes_h 1
+#ifndef G4MIRDThymus_h
+#define G4MIRDThymus_h 1
 
 #include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDTestes
+class G4MIRDThymus: public G4VOrgan
 {
 public:
 
-  G4MIRDTestes();
-  ~G4MIRDTestes();
-  G4VPhysicalVolume* ConstructTestes(G4VPhysicalVolume*, G4String, G4bool);
+  G4MIRDThymus();
+  ~G4MIRDThymus();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,  
+				    const G4String&,G4bool, G4bool);
 
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDThyroid.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -35,17 +35,19 @@
 #define G4MIRDThyroid_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDThyroid
+class G4MIRDThyroid: public G4VOrgan
 {
 public:
 
   G4MIRDThyroid();
   ~G4MIRDThyroid();
-  G4VPhysicalVolume* ConstructThyroid(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
 
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDTrunk.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -48,5 +48,6 @@ public:
   ~G4MIRDTrunk();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,  
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDUpperLargeIntestine.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -47,5 +47,6 @@ public:
   ~G4MIRDUpperLargeIntestine();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
 				    const G4String&,G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDUpperSpine.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4MIRDUrinaryBladder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -49,5 +49,6 @@ public:
   ~G4MIRDUrinaryBladder();
   G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDUterus.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -48,5 +48,6 @@ public:
   ~G4MIRDUterus();
   G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*, 
 				    const G4String&, G4bool, G4bool);
+private:
 };
 #endif

examples/advanced/human_phantom/include/G4MaleBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -45,8 +45,9 @@ public:
   G4MaleBuilder();
   ~G4MaleBuilder();
 
-  void BuildMaleGenitalia(G4bool);
-  void BuildTestes(G4bool);
+  void BuildMaleGenitalia(const G4String& colourName, G4bool solidVis, G4bool sensitivity);
+  void BuildLeftTeste(const G4String& colourName, G4bool solidVis, G4bool sensitivity);
+  void BuildRightTeste(const G4String& colourName, G4bool solidVis, G4bool sensitivity);
   // void SetModel(G4String);
 };
 #endif

examples/advanced/human_phantom/include/G4ORNLFemaleBodyFactory.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4ORNLMaleBodyFactory.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4PhantomBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 
@@ -66,7 +66,8 @@ public:
   void BuildRightScapula(const G4String&,G4bool,G4bool);
   void BuildLeftAdrenal(const G4String&,G4bool,G4bool);  
   void BuildRightAdrenal(const G4String&,G4bool,G4bool); 
-//  void BuildClavicles(G4bool);
+  void BuildLeftClavicle(const G4String&,G4bool,G4bool); 
+  void BuildRightClavicle(const G4String&,G4bool,G4bool); 
 
   void BuildBrain(const G4String&,G4bool,G4bool);
 
@@ -76,19 +77,19 @@ public:
   void BuildRightLung(const G4String&,G4bool,G4bool);
 
   void BuildStomach(const G4String&,G4bool,G4bool);
+  void BuildSmallIntestine(const G4String&,G4bool,G4bool);
   void BuildUpperLargeIntestine(const G4String&,G4bool,G4bool);
   void BuildLowerLargeIntestine(const G4String&,G4bool,G4bool);
- // void BuildEsophagus(G4bool);
 
   void BuildLeftKidney(const G4String&,G4bool,G4bool);
   void BuildRightKidney(const G4String&,G4bool,G4bool);
- // void BuildAdrenal(G4bool);
   void BuildLiver(const G4String&,G4bool,G4bool);
   void BuildPancreas(const G4String&,G4bool,G4bool);
   void BuildSpleen(const G4String&,G4bool,G4bool);
   void BuildUrinaryBladder(const G4String&,G4bool,G4bool);
 
   void BuildThyroid(const G4String&,G4bool,G4bool);
+  void BuildThymus(const G4String&,G4bool,G4bool);
 
   void SetModel(G4String);
   void SetMotherVolume(G4VPhysicalVolume*);

examples/advanced/human_phantom/include/G4PhantomHeadBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4VBodyFactory.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4VOrgan.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4VoxelBreastFactory.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4VoxelLeftBreast.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4VoxelRightBreast.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
+// Authors: S. Guatelli , M. G. Pia, INFN Genova and F. Ambroglini INFN Perugia, Italy
 // 
 // Based on code developed by the undergraduate student G. Guerrieri 
 // Note: this is a preliminary beta-version of the code; an improved 

examples/advanced/human_phantom/include/G4VoxelRightBreastSD.hh

@@ -1,53 +0,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-// Authors: S. Guatelli and M. G. Pia, INFN Genova, Italy
-// 
-// Based on code developed by the undergraduate student G. Guerrieri 
-// Note: this is a preliminary beta-version of the code; an improved 
-// version will be distributed in the next Geant4 public release, compliant
-// with the design in a forthcoming publication, and subject to a 
-// design and code review.
-//
-#ifndef G4VoxelRightBreastSD_h
-#define G4VoxelRightBreastSD_h 1
-
-#include "G4VSensitiveDetector.hh"
-
-//class G4Step;
-//class G4HCofThisEvent;
-
-class G4VoxelRightBreastSD : public G4VSensitiveDetector
-{
-  public:
-      G4VoxelRightBreastSD(G4String);
-     ~G4VoxelRightBreastSD();
-
-      void Initialize(G4HCofThisEvent*);
-      G4bool ProcessHits(G4Step*, G4TouchableHistory*);
-      void EndOfEvent(G4HCofThisEvent*);
-};
-#endif
-