Import Geant4 9.0.0 source tree

examples/advanced/human_phantom/include/G4BasePhantomBuilder.hh

@@ -0,0 +1,102 @@
+//
+// ********************************************************************
+// * 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 G4BasePhantomBuilder_h
+#define G4BasePhantomBuilder_h 1
+
+#include "G4VPhysicalVolume.hh"
+class G4VPhysicalVolume;
+class G4BasePhantomBuilder
+{
+public:
+
+  G4BasePhantomBuilder();
+  ~G4BasePhantomBuilder();
+ 
+  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 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 ;}
+  virtual void BuildRightArmBone(const G4String&,G4bool,G4bool) {return ;}
+  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 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 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 ;};
+  virtual void BuildRightAdrenal(const G4String&,G4bool,G4bool) {return ;};
+  virtual void BuildLiver(const G4String&,G4bool,G4bool) {return ;};
+  virtual void BuildPancreas(const G4String&,G4bool,G4bool) {return ;};
+  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 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;};
+
+};
+#endif

examples/advanced/human_phantom/include/G4CustomFemaleBuilder.hh

@@ -0,0 +1,54 @@
+//
+// ********************************************************************
+// * 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 G4CustomFemaleBuilder_h
+#define G4CustomFemaleBuilder_h 1
+
+//#include "G4VPhysicalVolume.hh"
+
+#include "G4PhantomBuilder.hh"
+
+class G4CustomFemaleBuilder: public G4PhantomBuilder
+{
+public:
+  G4CustomFemaleBuilder();
+  ~G4CustomFemaleBuilder();
+
+  void BuildVoxelLeftBreast(const G4String&, G4bool, G4bool);
+  void BuildVoxelRightBreast(const G4String&, G4bool, G4bool);
+  void BuildLeftOvary(const G4String&, G4bool, G4bool);
+  void BuildRightOvary(const G4String&, G4bool, G4bool);
+  void BuildUterus(const G4String&, G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4FemaleBuilder.hh

@@ -35,25 +35,20 @@
 #ifndef G4FemaleBuilder_h
 #define G4FemaleBuilder_h 1
 
-#include "G4VPhysicalVolume.hh"
+//#include "G4VPhysicalVolume.hh"
 
 #include "G4PhantomBuilder.hh"
 
-class G4PhantomBuilder;
-
-class G4VPhysicalVolume;
-class G4VBodyFactory;
 class G4FemaleBuilder: public G4PhantomBuilder
 {
 public:
   G4FemaleBuilder();
   ~G4FemaleBuilder();
 
-  void BuildBreast(G4bool sensitivity);
-  void BuildParameterisedBreast(G4bool sensitivity);
-  void BuildOvary(G4bool sensitivity);
-  void BuildUterus(G4bool sensitivity);
-  void BuildTestes(G4bool){;};
-  void BuildMaleGenitalia(G4bool){;};
+  void BuildLeftBreast(const G4String&, G4bool, G4bool);
+  void BuildRightBreast(const G4String&, G4bool, G4bool);
+  void BuildLeftOvary(const G4String&, G4bool, G4bool);
+  void BuildRightOvary(const G4String&, G4bool, G4bool);
+  void BuildUterus(const G4String&, G4bool, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4HumanDummyLeftBreastSD.hh

@@ -0,0 +1,64 @@
+//
+// ********************************************************************
+// * 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.          *
+// ********************************************************************
+//
+//    ********************************
+//    *                              *
+//    *       G4HumanDummyLeftBreastSD.hh       *
+//    *                              *
+//    ********************************
+//
+// 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.
+//
+// Dummy sensitive used only to flag sensitivity in cells of RO geometry.
+
+#ifndef G4HumanDummyLeftBreastSD_h
+#define G4HumanDummyLeftBreastSD_h 1
+
+#include "G4VSensitiveDetector.hh"
+class G4Step;
+
+class G4HumanDummyLeftBreastSD : public G4VSensitiveDetector
+{
+public:
+  G4HumanDummyLeftBreastSD();
+  ~G4HumanDummyLeftBreastSD() {};
+  
+  void Initialize(G4HCofThisEvent* ) {};
+  G4bool ProcessHits(G4Step* ,G4TouchableHistory*) {return false;}
+  void EndOfEvent(G4HCofThisEvent*) {};
+  void clear() {};
+  void DrawAll() {};
+  void PrintAll() {};
+};
+
+G4HumanDummyLeftBreastSD::G4HumanDummyLeftBreastSD() : G4VSensitiveDetector("dummyLeftBreastSD")
+{}
+#endif

examples/advanced/human_phantom/include/G4HumanDummyRightBreastSD.hh

@@ -39,17 +39,17 @@
 //
 // Dummy sensitive used only to flag sensitivity in cells of RO geometry.
 
-#ifndef G4HumanDummySD_h
-#define G4HumanDummySD_h 1
+#ifndef G4HumanDummyRightBreastSD_h
+#define G4HumanDummyRightBreastSD_h 1
 
 #include "G4VSensitiveDetector.hh"
 class G4Step;
 
-class G4HumanDummySD : public G4VSensitiveDetector
+class G4HumanDummyRightBreastSD : public G4VSensitiveDetector
 {
 public:
-  G4HumanDummySD();
-  ~G4HumanDummySD() {};
+  G4HumanDummyRightBreastSD();
+  ~G4HumanDummyRightBreastSD() {};
   
   void Initialize(G4HCofThisEvent* ) {};
   G4bool ProcessHits(G4Step* ,G4TouchableHistory*) {return false;}
@@ -59,6 +59,6 @@ public:
   void PrintAll() {};
 };
 
-G4HumanDummySD::G4HumanDummySD() : G4VSensitiveDetector("dummySD")
+G4HumanDummyRightBreastSD::G4HumanDummyRightBreastSD() : G4VSensitiveDetector("dummyRightBreastSD")
 {}
 #endif

examples/advanced/human_phantom/include/G4HumanPhantomAnalysisManager.hh

@@ -45,7 +45,9 @@
 namespace AIDA 
 {
   class ITree;
-  class IHistogramFactory;
+  class IHistogramFactory; 
+  class ITupleFactory;
+  class ITuple;
   class IAnalysisFactory;
   class ITreeFactory;
 };
@@ -53,17 +55,13 @@ namespace AIDA
 class G4HumanPhantomAnalysisManager { 
 
 public:
-  
   ~G4HumanPhantomAnalysisManager();
   static G4HumanPhantomAnalysisManager* getInstance();
 
   void book();
-  void particlePath(G4double);
-  void particleProjectionXY(G4double, G4double);
-  void particleProjectionYZ(G4double, G4double);
-  void particleProjectionZX(G4double, G4double);
-  void bodypartEnergyDep(G4double,G4double);
-  void innerBreastEnergyDep(G4int, G4int, G4double);
+  void bodyPartEnergyDeposit(G4int,G4double);
+  void voxelLeftBreastEnergyDeposit(G4int, G4int, G4double);
+  void voxelRightBreastEnergyDeposit(G4int, G4int, G4double);
   void finish();
 
 private:
@@ -73,13 +71,11 @@ private:
   AIDA::IAnalysisFactory*  aFact; 
   AIDA::ITreeFactory*      treeFact;
   AIDA::ITree*             theTree;
-  AIDA::IHistogramFactory* histogramFactory;
-  AIDA::IHistogram1D*      histogramParticlePath;
-  AIDA::IHistogram2D*      projectionXY;
-  AIDA::IHistogram2D*      projectionYZ;
-  AIDA::IHistogram2D*      projectionZX;
-  AIDA::IHistogram2D*      energy;
-  AIDA::IHistogram2D*      innerBreast;
+  AIDA::IHistogramFactory* histogramFactory; 
+  AIDA::ITupleFactory     *tupFact;
+  AIDA::ITuple *ntuple;
+  AIDA::IHistogram2D*      voxelLeftBreast;
+  AIDA::IHistogram2D*      voxelRightBreast;
 };
 #endif
 #endif

examples/advanced/human_phantom/include/G4HumanPhantomColour.hh

@@ -31,23 +31,36 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-
-#ifndef G4HumanPhantomEnergyDeposit_H
-#define G4HumanPhantomEnergyDeposit_H 1
+// This class manages colours
+//
+#ifndef G4HumanPhantomColour_H
+#define G4HumanPhantomColour_H 1
 
 #include "globals.hh"
-#include <map>
 
-class G4HumanPhantomEnergyDeposit 
-{
+class G4Colour;
+class G4HumanPhantomColour
+{ 
 public:
-  G4HumanPhantomEnergyDeposit();
-  ~G4HumanPhantomEnergyDeposit();
-  void Fill(G4String bodypartName, G4double energyDeposit);
-  void TotalEnergyDeposit();
+  G4HumanPhantomColour();
+  ~G4HumanPhantomColour();
 
-private:  
-  std::map<std::string,G4double> energyTotal;
-  G4String bodypartName;
+public:
+  //void  DefineColour();
+  G4Colour GetColour(const G4String&); //returns the colour
+
+private:
+  G4Colour white;
+  G4Colour pink;
+  G4Colour grey;
+  G4Colour yellow;
+  G4Colour blue;
+  G4Colour lightBlue;
+  G4Colour green;
+  G4Colour brown;
+  G4Colour purple;
+  G4Colour red;
+  G4Colour orange;
+  G4Colour black;
 };
 #endif

examples/advanced/human_phantom/include/G4HumanPhantomConstruction.hh

@@ -41,35 +41,28 @@
 #include <map>
 
 class G4VPhysicalVolume;
-//class G4LogicalVolume;
-//class G4HumanPhantomSD;
 class G4HumanPhantomMaterial;
-//class G4PhantomBuilder;
-class G4HumanPhantomEnergyDeposit;
 class G4HumanPhantomConstruction : public G4VUserDetectorConstruction
 {
   public:
-     G4HumanPhantomConstruction(G4HumanPhantomEnergyDeposit*);
+     G4HumanPhantomConstruction();
     ~G4HumanPhantomConstruction();
      G4VPhysicalVolume* Construct();
 
   void SetBodyPartSensitivity(G4String, G4bool);
-  void CleanPhantom();
-  void UpdatePhantom();
+
   void SetPhantomSex(G4String);
   void SetPhantomModel(G4String);
 
-  G4VPhysicalVolume* GetMotherVolume(){return mother;};
+  //G4VPhysicalVolume* GetMotherVolume(){return mother;};
  
  private:
-  G4HumanPhantomEnergyDeposit* edepTot;
+  G4HumanPhantomMaterial* material;
   G4HumanPhantomMessenger* messenger;
-
-  G4VPhysicalVolume*       mother;
+  G4VPhysicalVolume* ConstructWorld();
 
   G4String                 model;
   G4String                 sex;
-  G4HumanPhantomMaterial* material;
   std::map<std::string,G4bool> sensitivities;
 };
 

examples/advanced/human_phantom/include/G4HumanPhantomEventAction.hh

@@ -36,17 +36,26 @@
 
 #include "G4UserEventAction.hh"
 #include "globals.hh"
+#include <map>
 
 class G4Event;
 class G4HumanPhantomEventAction : public G4UserEventAction
 {
-  public:
-    G4HumanPhantomEventAction();
-   ~G4HumanPhantomEventAction();
+public:
+  G4HumanPhantomEventAction();
+  ~G4HumanPhantomEventAction();
 
-  public:
-    void BeginOfEventAction(const G4Event*);
-    void EndOfEventAction(const G4Event*);
+public:
+  void BeginOfEventAction(const G4Event*);
+  void EndOfEventAction(const G4Event*);
+
+private:
+  void Fill(G4String bodypartName, G4double energyDeposit);
+  void totalEventEnergyDeposit();
+ 
+  G4int hitCollectionID; 
+  std::map<std::string,G4double> energyTotal;
+  G4String bodypartName;
 };
 #endif
 

examples/advanced/human_phantom/include/G4HumanPhantomHit.hh

@@ -0,0 +1,83 @@
+//
+// ********************************************************************
+// * 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.          *
+// ********************************************************************
+//
+//
+// $Id: G4HumanPhantomHit.hh,v 1.10 2007/05/15 14:46:54 guatelli Exp $
+// GEANT4 tag $Name: geant4-09-00 $
+//
+
+#ifndef G4HumanPhantomHit_h
+#define G4HumanPhantomHit_h 1
+
+#include "G4VHit.hh"
+#include "G4THitsCollection.hh"
+#include "G4Allocator.hh"
+#include "G4ThreeVector.hh"
+
+class G4HumanPhantomHit : public G4VHit
+{
+public:
+
+  G4HumanPhantomHit();
+  ~G4HumanPhantomHit();
+  G4HumanPhantomHit(const G4HumanPhantomHit&);
+  const G4HumanPhantomHit& operator=(const G4HumanPhantomHit&);
+  G4int operator==(const G4HumanPhantomHit&) const;
+
+  inline void* operator new(size_t);
+  inline void  operator delete(void*);
+
+  void Draw();
+  void Print();
+
+public:  
+  void SetBodyPartID  (G4String bodyPartName) { bodyPartID = bodyPartName;};
+  void SetEdep (G4double de) { edep = de; };
+      
+  G4String GetBodyPartID() { return bodyPartID; };
+  G4double GetEdep()    { return edep; };      
+      
+private:
+  G4String bodyPartID;
+  G4double      edep;    
+};
+
+typedef G4THitsCollection<G4HumanPhantomHit> G4HumanPhantomHitsCollection;
+
+extern G4Allocator<G4HumanPhantomHit> G4HumanPhantomHitAllocator;
+
+inline void* G4HumanPhantomHit::operator new(size_t)
+{
+  void *aHit;
+  aHit = (void *) G4HumanPhantomHitAllocator.MallocSingle();
+  return aHit;
+}
+
+inline void G4HumanPhantomHit::operator delete(void *aHit)
+{
+  G4HumanPhantomHitAllocator.FreeSingle((G4HumanPhantomHit*) aHit);
+}
+
+#endif

examples/advanced/human_phantom/include/G4HumanPhantomMessenger.hh

@@ -65,7 +65,6 @@ private:
   G4UIcmdWithAString*            sexCmd;  
   G4UIcmdWithAString*            bodypartCmd;
   G4UIcmdWithoutParameter*       endCmd;
-  G4UIcmdWithoutParameter*       cleanCmd;
 
   G4String                       bodypart;
   G4bool                         bps;

examples/advanced/human_phantom/include/G4HumanPhantomRunAction.hh

@@ -37,6 +37,7 @@
 
 #include "G4UserRunAction.hh"
 #include "globals.hh"
+#include <map>
 
 class G4HumanPhantomRunAction : public G4UserRunAction
 {
@@ -47,6 +48,12 @@ class G4HumanPhantomRunAction : public G4UserRunAction
   public:
     void BeginOfRunAction(const G4Run*);
     void EndOfRunAction(const G4Run*);
+    void Fill(G4String bodypartName, G4double energyDeposit);
+private:
+    void totalRunEnergyDeposit();
+    std::map<std::string,G4double> energyTotal;
+    G4String bodypartName;
+
 };
 #endif
 

examples/advanced/human_phantom/include/G4HumanPhantomSD.hh

@@ -35,22 +35,22 @@
 #define G4HumanPhantomSD_h 1
 
 #include "G4VSensitiveDetector.hh"
+#include "G4HumanPhantomHit.hh"
 
 class G4Step;
-class G4HumanPhantomEnergyDeposit;
 
 class G4HumanPhantomSD : public G4VSensitiveDetector
 {
   public:
-      G4HumanPhantomSD(G4String,G4HumanPhantomEnergyDeposit*);
+      G4HumanPhantomSD(G4String);
      ~G4HumanPhantomSD();
 
       void Initialize(G4HCofThisEvent*);
       G4bool ProcessHits(G4Step*, G4TouchableHistory*);
       void EndOfEvent(G4HCofThisEvent*);
-
-  private:
-  G4HumanPhantomEnergyDeposit* energyTotal;
+ 
+ private:
+      G4HumanPhantomHitsCollection* collection;
 };
 #endif
 

examples/advanced/human_phantom/include/G4HumanPhantomSteppingAction.hh

@@ -43,7 +43,6 @@ class G4HumanPhantomSteppingAction : public G4UserSteppingAction
   public:
     G4HumanPhantomSteppingAction();
    ~G4HumanPhantomSteppingAction();
-
     void UserSteppingAction(const G4Step*);
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDBodyFactory.hh

@@ -36,62 +36,21 @@
 #define G4MIRDBodyFactory_h 1
 
 #include "G4VBodyFactory.hh"
-
+#include "G4VOrgan.hh"
+#include <map>
 class G4VBodyFactory;
 class G4VPhysicalVolume;
+class G4VOrgan;
+
 class G4MIRDBodyFactory: public G4VBodyFactory
 {
 public:
   G4MIRDBodyFactory();
  ~G4MIRDBodyFactory();
-
-  G4VPhysicalVolume* CreateHead(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateTrunk(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateLegs(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateUpperSpine(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateMiddleLowerSpine(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateLegBone(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateArmBone(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateSkull(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateRibCage(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreatePelvis(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateBreast(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateParameterisedBreast(G4VPhysicalVolume*,
-  				       G4String,G4bool);
-
-  G4VPhysicalVolume* CreateUterus(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateOvary(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateTestes(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateBrain(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateHeart(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateLung(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateStomach(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateUpperLargeIntestine(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateLowerLargeIntestine(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateKidney(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateAdrenal(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateLiver(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreatePancreas(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateSpleen(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateUrinaryBladder(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateThyroid(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateEsophagus(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateNeck(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateScapulae(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateClavicles(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateMaleGenitalia(G4VPhysicalVolume*,G4String,G4bool);
-
+  G4VPhysicalVolume* CreateOrgan(const G4String&, G4VPhysicalVolume*, 
+				 const G4String&,G4bool,G4bool);
+ 
 private:
-  
+  std::map<std::string,G4VOrgan*> organ; 
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDBrain.hh

@@ -35,20 +35,21 @@
 #define G4MIRDBrain_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 //#include "Saxana/SAXProcessor.h"
 ///#include "Saxana/ProcessingConfigurator.h"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDBrain
+class G4MIRDBrain: public G4VOrgan
 {
 public:
 
   G4MIRDBrain();
   ~G4MIRDBrain();
-  G4VPhysicalVolume* ConstructBrain(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
+				    const G4String&, G4bool, G4bool);
  
 private:
   //AXProcessor sxp;

examples/advanced/human_phantom/include/G4MIRDHead.hh

@@ -35,7 +35,7 @@
 #define G4MIRDHead_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 //##include "Saxana/SAXProcessor.h"
 //#include "Saxana/ProcessingConfigurator.h"
 
@@ -43,13 +43,14 @@ class G4VPhysicalVolume;
 class G4LogicalVolume;
 class G4HumanPhantomMaterial;
 
-class G4MIRDHead
+class G4MIRDHead: public G4VOrgan
 {
 public:
 
   G4MIRDHead();
   ~G4MIRDHead();
-  G4VPhysicalVolume* ConstructHead(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*, const G4String&, 
+				    G4bool, G4bool);
  
 private:
   //  SAXProcessor sxp;

examples/advanced/human_phantom/include/G4MIRDHeart.hh

@@ -35,16 +35,17 @@
 #define G4MIRDHeart_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDHeart
+class G4MIRDHeart:public G4VOrgan
 {
 public:
 
   G4MIRDHeart();
   ~G4MIRDHeart();
-  G4VPhysicalVolume* ConstructHeart(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftAdrenal.hh

@@ -0,0 +1,51 @@
+//
+// ********************************************************************
+// * 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 G4MIRDLeftAdrenal_h
+#define G4MIRDLeftAdrenal_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDLeftAdrenal: public G4VOrgan
+{
+public:
+
+  G4MIRDLeftAdrenal();
+  ~G4MIRDLeftAdrenal();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
+				    const G4String&,G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDLeftArmBone.hh

@@ -32,22 +32,22 @@
 // design and code review.
 //
 
-#ifndef G4MIRDArmBone_h
-#define G4MIRDArmBone_h 1
+#ifndef G4MIRDLeftArmBone_h
+#define G4MIRDLeftArmBone_h 1
 
 #include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDArmBone
+class G4MIRDLeftArmBone: public G4VOrgan
 {
 public:
+  G4MIRDLeftArmBone();
+  ~G4MIRDLeftArmBone();
 
-  G4MIRDArmBone();
-  ~G4MIRDArmBone();
-
-  G4VPhysicalVolume* ConstructArmBone(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, const G4String&, G4bool, G4bool);
  
 private:
   //    SAXProcessor sxp;

examples/advanced/human_phantom/include/G4MIRDLeftBreast.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 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 G4MIRDLeftBreast_h
+#define G4MIRDLeftBreast_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDLeftBreast: public G4VOrgan
+{
+public:
+
+  G4MIRDLeftBreast();
+  ~G4MIRDLeftBreast();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDLeftKidney.hh

@@ -0,0 +1,51 @@
+//
+// ********************************************************************
+// * 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 G4MIRDLeftKidney_h
+#define G4MIRDLeftKidney_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDLeftKidney: public G4VOrgan
+{
+public:
+
+  G4MIRDLeftKidney();
+  ~G4MIRDLeftKidney();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
+				    const G4String&,G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDLeftLeg.hh

@@ -31,23 +31,21 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4MIRDLegBone_h
-#define G4MIRDLegBone_h 1
+#ifndef G4MIRDLeftLeg_h
+#define G4MIRDLeftLeg_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDLegBone
+class G4MIRDLeftLeg:public G4VOrgan
 {
 public:
 
-  G4MIRDLegBone();
-  ~G4MIRDLegBone();
-  G4VPhysicalVolume* ConstructLegBone(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-
+  G4MIRDLeftLeg();
+  ~G4MIRDLeftLeg();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftLegBone.hh

@@ -0,0 +1,51 @@
+//
+// ********************************************************************
+// * 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 G4MIRDLeftLegBone_h
+#define G4MIRDLeftLegBone_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDLeftLegBone: public G4VOrgan
+{
+public:
+
+  G4MIRDLeftLegBone();
+  ~G4MIRDLeftLegBone();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDLeftLung.hh

@@ -31,21 +31,23 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4MIRDLung_h
-#define G4MIRDLung_h 1
+#ifndef G4MIRDLeftLung_h
+#define G4MIRDLeftLung_h 1
 
 #include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDLung
+class G4MIRDLeftLung: public G4VOrgan
 {
 public:
 
-  G4MIRDLung();
-  ~G4MIRDLung();
-  G4VPhysicalVolume* ConstructLung(G4VPhysicalVolume*, G4String, G4bool);
+  G4MIRDLeftLung();
+  ~G4MIRDLeftLung();
+  G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*, 
+				    const G4String&,G4bool, G4bool);
 
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftOvary.hh

@@ -31,20 +31,22 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4MIRDLegs_h
-#define G4MIRDLegs_h 1
+#ifndef G4MIRDLeftOvary_h
+#define G4MIRDLeftOvary_h 1
 
 #include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
-class G4LogicalVolume;
 
-class G4MIRDLegs
+class G4MIRDLeftOvary: public G4VOrgan
 {
 public:
 
-  G4MIRDLegs();
-  ~G4MIRDLegs();
-  G4VPhysicalVolume* ConstructLegs(G4VPhysicalVolume*, G4String, G4bool);
+  G4MIRDLeftOvary();
+  ~G4MIRDLeftOvary();
+  G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
+
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLeftScapula.hh

@@ -0,0 +1,51 @@
+//
+// ********************************************************************
+// * 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 G4MIRDLeftScapula_h
+#define G4MIRDLeftScapula_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDLeftScapula:public G4VOrgan
+{
+public:
+
+  G4MIRDLeftScapula();
+  ~G4MIRDLeftScapula();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDLiver.hh

@@ -35,17 +35,17 @@
 #define G4MIRDLiver_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 class G4VPhysicalVolume;
-class G4LogicalVolume;
 
-class G4MIRDLiver
+class G4MIRDLiver: public G4VOrgan
 {
 public:
 
   G4MIRDLiver();
   ~G4MIRDLiver();
-  G4VPhysicalVolume* ConstructLiver(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
 
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDLowerLargeIntestine.hh

@@ -35,16 +35,17 @@
 #define G4MIRDLowerLargeIntestine_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDLowerLargeIntestine
+class G4MIRDLowerLargeIntestine: public G4VOrgan
 {
 public:
 
   G4MIRDLowerLargeIntestine();
   ~G4MIRDLowerLargeIntestine();
-  G4VPhysicalVolume* ConstructLowerLargeIntestine(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
+				    const G4String&, G4bool, G4bool);
  };
 #endif

examples/advanced/human_phantom/include/G4MIRDMiddleLowerSpine.hh

@@ -35,17 +35,19 @@
 #define G4MIRDMiddleLowerSpine_h 1
 
 #include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDMiddleLowerSpine
+class G4MIRDMiddleLowerSpine: public G4VOrgan
 {
 public:
 
   G4MIRDMiddleLowerSpine();
   ~G4MIRDMiddleLowerSpine();
-  G4VPhysicalVolume* ConstructMiddleLowerSpine(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
  
 private:
 };

examples/advanced/human_phantom/include/G4MIRDPancreas.hh

@@ -35,20 +35,21 @@
 #define G4MIRDPancreas_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 //#include "Saxana/SAXProcessor.h"
 //#include "Saxana/ProcessingConfigurator.h"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDPancreas
+class G4MIRDPancreas: public G4VOrgan
 {
 public:
 
   G4MIRDPancreas();
   ~G4MIRDPancreas();
-  G4VPhysicalVolume* ConstructPancreas(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
+				    const G4String&, G4bool, G4bool);
  
 private:
   //    SAXProcessor sxp;

examples/advanced/human_phantom/include/G4MIRDPelvis.hh

@@ -35,16 +35,17 @@
 #define G4MIRDPelvis_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDPelvis
+class G4MIRDPelvis: public G4VOrgan
 {
 public:
 
   G4MIRDPelvis();
   ~G4MIRDPelvis();
-  G4VPhysicalVolume* ConstructPelvis(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRibCage.hh

@@ -35,24 +35,32 @@
 #define G4MIRDRibCage_h 1
 
 #include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDRibCage
+class G4MIRDRibCage: public G4VOrgan
 {
 public:
 
   G4MIRDRibCage();
   ~G4MIRDRibCage();
-  G4VPhysicalVolume* ConstructRibCage(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,  
+				    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;
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightAdrenal.hh

@@ -0,0 +1,51 @@
+//
+// ********************************************************************
+// * 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 G4MIRDRightAdrenal_h
+#define G4MIRDRightAdrenal_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDRightAdrenal: public G4VOrgan
+{
+public:
+
+  G4MIRDRightAdrenal();
+  ~G4MIRDRightAdrenal();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
+				    const G4String&,G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDRightArmBone.hh

@@ -31,28 +31,28 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4ORNLArmBone_h
-#define G4ORNLArmBone_h 1
+
+#ifndef G4MIRDRightArmBone_h
+#define G4MIRDRightArmBone_h 1
 
 #include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
+#include "G4VOrgan.hh"
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4ORNLArmBone
+class G4MIRDRightArmBone: public G4VOrgan
 {
 public:
 
-  G4ORNLArmBone();
-  ~G4ORNLArmBone();
-  G4VPhysicalVolume* ConstructArmBone(G4VPhysicalVolume*, G4String, G4bool);
+  G4MIRDRightArmBone();
+  ~G4MIRDRightArmBone();
+
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
+				    const G4String&,G4bool, G4bool);
  
 private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
+  //    SAXProcessor sxp;
+  //  ProcessingConfigurator config;
 
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightBreast.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 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 G4MIRDRightBreast_h
+#define G4MIRDRightBreast_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDRightBreast: public G4VOrgan
+{
+public:
+
+  G4MIRDRightBreast();
+  ~G4MIRDRightBreast();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&,G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDRightKidney.hh

@@ -0,0 +1,51 @@
+//
+// ********************************************************************
+// * 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 G4MIRDRightKidney_h
+#define G4MIRDRightKidney_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDRightKidney: public G4VOrgan
+{
+public:
+
+  G4MIRDRightKidney();
+  ~G4MIRDRightKidney();
+  G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*,  
+				    const G4String&, G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDRightLeg.hh

@@ -31,20 +31,21 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4MIRDBreast_h
-#define G4MIRDBreast_h 1
+#ifndef G4MIRDRightLeg_h
+#define G4MIRDRightLeg_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDBreast
+class G4MIRDRightLeg:public G4VOrgan
 {
 public:
 
-  G4MIRDBreast();
-  ~G4MIRDBreast();
-  G4VPhysicalVolume* ConstructBreast(G4VPhysicalVolume*, G4String, G4bool);
+  G4MIRDRightLeg();
+  ~G4MIRDRightLeg();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&,G4bool, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightLegBone.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 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 G4MIRDRightLegBone_h
+#define G4MIRDRightLegBone_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDRightLegBone: public G4VOrgan
+{
+public:
+
+  G4MIRDRightLegBone();
+  ~G4MIRDRightLegBone();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
+
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDRightLung.hh

@@ -31,21 +31,23 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4MIRDOvary_h
-#define G4MIRDOvary_h 1
+#ifndef G4MIRDRightLung_h
+#define G4MIRDRightLung_h 1
 
 #include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDOvary
+class G4MIRDRightLung: public G4VOrgan
 {
 public:
 
-  G4MIRDOvary();
-  ~G4MIRDOvary();
-  G4VPhysicalVolume* ConstructOvary(G4VPhysicalVolume*, G4String, G4bool);
+  G4MIRDRightLung();
+  ~G4MIRDRightLung();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
+				    const G4String&, G4bool, G4bool);
 
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDRightOvary.hh

@@ -0,0 +1,53 @@
+//
+// ********************************************************************
+// * 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 G4MIRDRightOvary_h
+#define G4MIRDRightOvary_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDRightOvary: public G4VOrgan
+{
+public:
+
+  G4MIRDRightOvary();
+  ~G4MIRDRightOvary();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,  
+				    const G4String&,G4bool, G4bool);
+
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDRightScapula.hh

@@ -0,0 +1,51 @@
+//
+// ********************************************************************
+// * 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 G4MIRDRightScapula_h
+#define G4MIRDRightScapula_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4MIRDRightScapula:public G4VOrgan
+{
+public:
+
+  G4MIRDRightScapula();
+  ~G4MIRDRightScapula();
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4MIRDSkull.hh

@@ -35,17 +35,18 @@
 #define G4MIRDSkull_h 1
 
 #include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDSkull
+class G4MIRDSkull: public G4VOrgan
 {
 public:
-
   G4MIRDSkull();
   ~G4MIRDSkull();
-  G4VPhysicalVolume* ConstructSkull(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
  
 private:
 

examples/advanced/human_phantom/include/G4MIRDSpleen.hh

@@ -35,18 +35,19 @@
 #define G4MIRDSpleen_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDSpleen
+class G4MIRDSpleen: public G4VOrgan
 {
 public:
 
   G4MIRDSpleen();
   ~G4MIRDSpleen();
-  G4VPhysicalVolume* ConstructSpleen(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,  
+				    const G4String&, G4bool, G4bool);
  
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDStomach.hh

@@ -35,16 +35,18 @@
 #define G4MIRDStomach_h 1
 
 #include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDStomach
+class G4MIRDStomach: public G4VOrgan
 {
 public:
 
   G4MIRDStomach();
   ~G4MIRDStomach();
-  G4VPhysicalVolume* ConstructStomach(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*,
+				    const G4String&, G4bool, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDTrunk.hh

@@ -35,24 +35,18 @@
 #define G4MIRDTrunk_h 1
 
 #include "G4VPhysicalVolume.hh"
-
-//#include "Saxana/SAXProcessor.h"
-//#include "Saxana/ProcessingConfigurator.h"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDTrunk
+class G4MIRDTrunk:public G4VOrgan
 {
 public:
 
   G4MIRDTrunk();
   ~G4MIRDTrunk();
-  G4VPhysicalVolume* ConstructTrunk(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-  //    SAXProcessor sxp;
-  //  ProcessingConfigurator config;
-
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,  
+				    const G4String&, G4bool, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDUpperLargeIntestine.hh

@@ -35,16 +35,17 @@
 #define G4MIRDUpperLargeIntestine_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDUpperLargeIntestine
+class G4MIRDUpperLargeIntestine: public G4VOrgan
 {
 public:
 
   G4MIRDUpperLargeIntestine();
   ~G4MIRDUpperLargeIntestine();
-  G4VPhysicalVolume* ConstructUpperLargeIntestine(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,
+				    const G4String&,G4bool, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDUpperSpine.hh

@@ -35,18 +35,19 @@
 #define G4MIRDUpperSpine_h 1
 
 #include "G4VPhysicalVolume.hh"
-
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDUpperSpine
+class G4MIRDUpperSpine: public G4VOrgan
 {
 public:
 
   G4MIRDUpperSpine();
   ~G4MIRDUpperSpine();
-  G4VPhysicalVolume* ConstructUpperSpine(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*,const G4String&, 
+				    G4bool, G4bool);
  
 private:
 };

examples/advanced/human_phantom/include/G4MIRDUrinaryBladder.hh

@@ -36,16 +36,18 @@
 #define G4MIRDUrinaryBladder_h 1
 
 #include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDUrinaryBladder
+class G4MIRDUrinaryBladder: public G4VOrgan
 {
 public:
 
   G4MIRDUrinaryBladder();
   ~G4MIRDUrinaryBladder();
-  G4VPhysicalVolume* ConstructUrinaryBladder(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&,G4VPhysicalVolume*, 
+				    const G4String&, G4bool, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4MIRDUterus.hh

@@ -35,16 +35,18 @@
 #define G4MIRDUterus_h 1
 
 #include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDUterus
+class G4MIRDUterus: public G4VOrgan
 {
 public:
 
   G4MIRDUterus();
   ~G4MIRDUterus();
-  G4VPhysicalVolume* ConstructUterus(G4VPhysicalVolume*, G4String, G4bool);
+  G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*, 
+				    const G4String&, G4bool, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4MaleBuilder.hh

@@ -44,11 +44,9 @@ class G4MaleBuilder: public G4PhantomBuilder
 public:
   G4MaleBuilder();
   ~G4MaleBuilder();
-  void BuildBreast(G4bool){;};
-  void BuildParameterisedBreast(G4bool){;};
-  void BuildOvary(G4bool){;};
-  void BuildUterus(G4bool){;};
+
   void BuildMaleGenitalia(G4bool);
   void BuildTestes(G4bool);
+  // void SetModel(G4String);
 };
 #endif

examples/advanced/human_phantom/include/G4ORNLBodyFactory.hh

@@ -1,96 +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 G4ORNLBodyFactory_h
-#define G4ORNLBodyFactory_h 1
-
-#include "G4VBodyFactory.hh"
-
-class G4VBodyFactory;
-class G4ORNLBodyFactory: public G4VBodyFactory
-{
-public:
-  G4ORNLBodyFactory();
- ~G4ORNLBodyFactory();
-
-  G4VPhysicalVolume* CreateHead(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateTrunk(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateLegs(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateNeck(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateUpperSpine(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateMiddleLowerSpine(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateLegBone(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateArmBone(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateSkull(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateRibCage(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreatePelvis(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateScapulae(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateClavicles(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateBreast(G4VPhysicalVolume*,G4String,G4bool);
- G4VPhysicalVolume* CreateParameterisedBreast(G4VPhysicalVolume*,G4String,G4bool) { G4cout<< "Parameterised breast is not available for ORNL model"<< G4endl;
-    return 0;};
-
-
-  G4VPhysicalVolume* CreateUterus(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateOvary(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateTestes(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateMaleGenitalia(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateBrain(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateHeart(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateLung(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateStomach(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateUpperLargeIntestine(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateLowerLargeIntestine(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateEsophagus(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateKidney(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateAdrenal(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateLiver(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreatePancreas(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateSpleen(G4VPhysicalVolume*,G4String,G4bool);
-  G4VPhysicalVolume* CreateUrinaryBladder(G4VPhysicalVolume*,G4String,G4bool);
-
-  G4VPhysicalVolume* CreateThyroid(G4VPhysicalVolume*,G4String,G4bool);
-
-
-private:
-  
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLBrain.hh

@@ -1,58 +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 G4ORNLBrain_h
-#define G4ORNLBrain_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLBrain
-{
-public:
-
-  G4ORNLBrain();
-  ~G4ORNLBrain();
-  G4VPhysicalVolume* ConstructBrain(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLBreast.hh

@@ -1,58 +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 G4ORNLBreast_h
-#define G4ORNLBreast_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLBreast
-{
-public:
-
-  G4ORNLBreast();
-  ~G4ORNLBreast();
-  G4VPhysicalVolume* ConstructBreast(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLEsophagus.hh

@@ -1,58 +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 G4ORNLEsophagus_h
-#define G4ORNLEsophagus_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLEsophagus
-{
-public:
-
-  G4ORNLEsophagus();
-  ~G4ORNLEsophagus();
-  G4VPhysicalVolume* ConstructEsophagus(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLFemaleBodyFactory.hh

@@ -31,28 +31,23 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4MIRDAdrenal_h
-#define G4MIRDAdrenal_h 1
+#ifndef G4ORNLFemaleBodyFactory_h
+#define G4ORNLFemaleBodyFactory_h 1
 
+#include "G4VBodyFactory.hh"
 #include "G4VPhysicalVolume.hh"
 
 #include "Saxana/SAXProcessor.h"
 #include "Saxana/ProcessingConfigurator.h"
 
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4MIRDAdrenal
+class G4VBodyFactory;
+class G4ORNLFemaleBodyFactory: public G4VBodyFactory
 {
 public:
-
-  G4MIRDAdrenal();
-  ~G4MIRDAdrenal();
-  G4VPhysicalVolume* ConstructAdrenal(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
+  G4ORNLFemaleBodyFactory();
+ ~G4ORNLFemaleBodyFactory();
+  
+  G4VPhysicalVolume* CreateOrgan(const G4String&,G4VPhysicalVolume*,
+				 const G4String&, G4bool, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4ORNLHead.hh

@@ -1,58 +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 G4ORNLHead_h
-#define G4ORNLHead_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLHead
-{
-public:
-
-  G4ORNLHead();
-  ~G4ORNLHead();
-  G4VPhysicalVolume* ConstructHead(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLHeart.hh

@@ -1,58 +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 G4ORNLHeart_h
-#define G4ORNLHeart_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLHeart
-{
-public:
-
-  G4ORNLHeart();
-  ~G4ORNLHeart();
-  G4VPhysicalVolume* ConstructHeart(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLKidney.hh

@@ -1,58 +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 G4ORNLKidney_h
-#define G4ORNLKidney_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLKidney
-{
-public:
-
-  G4ORNLKidney();
-  ~G4ORNLKidney();
-  G4VPhysicalVolume* ConstructKidney(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLLegBone.hh

@@ -1,58 +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 G4ORNLLegBone_h
-#define G4ORNLLegBone_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLLegBone
-{
-public:
-
-  G4ORNLLegBone();
-  ~G4ORNLLegBone();
-  G4VPhysicalVolume* ConstructLegBone(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLLegs.hh

@@ -1,58 +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 G4ORNLLegs_h
-#define G4ORNLLegs_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLLegs
-{
-public:
-
-  G4ORNLLegs();
-  ~G4ORNLLegs();
-  G4VPhysicalVolume* ConstructLegs(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLLiver.hh

@@ -1,58 +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 G4ORNLLiver_h
-#define G4ORNLLiver_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLLiver
-{
-public:
-
-  G4ORNLLiver();
-  ~G4ORNLLiver();
-  G4VPhysicalVolume* ConstructLiver(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLLowerLargeIntestine.hh

@@ -1,58 +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 G4ORNLLowerLargeIntestine_h
-#define G4ORNLLowerLargeIntestine_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLLowerLargeIntestine
-{
-public:
-
-  G4ORNLLowerLargeIntestine();
-  ~G4ORNLLowerLargeIntestine();
-  G4VPhysicalVolume* ConstructLowerLargeIntestine(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLLung.hh

@@ -1,58 +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 G4ORNLLung_h
-#define G4ORNLLung_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLLung
-{
-public:
-
-  G4ORNLLung();
-  ~G4ORNLLung();
-  G4VPhysicalVolume* ConstructLung(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLMaleBodyFactory.hh

@@ -0,0 +1,49 @@
+//
+// ********************************************************************
+// * 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 G4ORNLMaleBodyFactory_h
+#define G4ORNLMaleBodyFactory_h 1
+
+#include "G4VBodyFactory.hh"
+
+class G4VBodyFactory;
+class G4ORNLMaleBodyFactory: public G4VBodyFactory
+{
+public:
+  G4ORNLMaleBodyFactory();
+ ~G4ORNLMaleBodyFactory();
+  
+  G4VPhysicalVolume* CreateOrgan(const G4String&,G4VPhysicalVolume*, 
+				 const G4String&, G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4ORNLMiddleLowerSpine.hh

@@ -1,58 +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 G4ORNLMiddleLowerSpine_h
-#define G4ORNLMiddleLowerSpine_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLMiddleLowerSpine
-{
-public:
-
-  G4ORNLMiddleLowerSpine();
-  ~G4ORNLMiddleLowerSpine();
-  G4VPhysicalVolume* ConstructMiddleLowerSpine(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLOvary.hh

@@ -1,58 +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 G4ORNLOvary_h
-#define G4ORNLOvary_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLOvary
-{
-public:
-
-  G4ORNLOvary();
-  ~G4ORNLOvary();
-  G4VPhysicalVolume* ConstructOvary(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLPancreas.hh

@@ -1,58 +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 G4ORNLPancreas_h
-#define G4ORNLPancreas_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLPancreas
-{
-public:
-
-  G4ORNLPancreas();
-  ~G4ORNLPancreas();
-  G4VPhysicalVolume* ConstructPancreas(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLPelvis.hh

@@ -1,58 +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 G4ORNLPelvis_h
-#define G4ORNLPelvis_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLPelvis
-{
-public:
-
-  G4ORNLPelvis();
-  ~G4ORNLPelvis();
-  G4VPhysicalVolume* ConstructPelvis(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLRibCage.hh

@@ -1,58 +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 G4ORNLRibCage_h
-#define G4ORNLRibCage_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLRibCage
-{
-public:
-
-  G4ORNLRibCage();
-  ~G4ORNLRibCage();
-  G4VPhysicalVolume* ConstructRibCage(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLSkull.hh

@@ -1,58 +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 G4ORNLSkull_h
-#define G4ORNLSkull_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLSkull
-{
-public:
-
-  G4ORNLSkull();
-  ~G4ORNLSkull();
-  G4VPhysicalVolume* ConstructSkull(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLSpleen.hh

@@ -1,58 +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 G4ORNLSpleen_h
-#define G4ORNLSpleen_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLSpleen
-{
-public:
-
-  G4ORNLSpleen();
-  ~G4ORNLSpleen();
-  G4VPhysicalVolume* ConstructSpleen(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLStomach.hh

@@ -1,58 +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 G4ORNLStomach_h
-#define G4ORNLStomach_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLStomach
-{
-public:
-
-  G4ORNLStomach();
-  ~G4ORNLStomach();
-  G4VPhysicalVolume* ConstructStomach(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLTestes.hh

@@ -1,58 +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 G4ORNLTestes_h
-#define G4ORNLTestes_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLTestes
-{
-public:
-
-  G4ORNLTestes();
-  ~G4ORNLTestes();
-  G4VPhysicalVolume* ConstructTestes(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLThyroid.hh

@@ -1,58 +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 G4ORNLThyroid_h
-#define G4ORNLThyroid_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLThyroid
-{
-public:
-
-  G4ORNLThyroid();
-  ~G4ORNLThyroid();
-  G4VPhysicalVolume* ConstructThyroid(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLTrunk.hh

@@ -1,58 +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 G4ORNLTrunk_h
-#define G4ORNLTrunk_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLTrunk
-{
-public:
-
-  G4ORNLTrunk();
-  ~G4ORNLTrunk();
-  G4VPhysicalVolume* ConstructTrunk(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLUpperLargeIntestine.hh

@@ -1,58 +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 G4ORNLUpperLargeIntestine_h
-#define G4ORNLUpperLargeIntestine_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLUpperLargeIntestine
-{
-public:
-
-  G4ORNLUpperLargeIntestine();
-  ~G4ORNLUpperLargeIntestine();
-  G4VPhysicalVolume* ConstructUpperLargeIntestine(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLUpperSpine.hh

@@ -1,58 +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 G4ORNLUpperSpine_h
-#define G4ORNLUpperSpine_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLUpperSpine
-{
-public:
-
-  G4ORNLUpperSpine();
-  ~G4ORNLUpperSpine();
-  G4VPhysicalVolume* ConstructUpperSpine(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLUrinaryBladder.hh

@@ -1,58 +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 G4ORNLUrinaryBladder_h
-#define G4ORNLUrinaryBladder_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLUrinaryBladder
-{
-public:
-
-  G4ORNLUrinaryBladder();
-  ~G4ORNLUrinaryBladder();
-  G4VPhysicalVolume* ConstructUrinaryBladder(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ORNLUterus.hh

@@ -1,58 +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 G4ORNLUterus_h
-#define G4ORNLUterus_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-
-class G4ORNLUterus
-{
-public:
-
-  G4ORNLUterus();
-  ~G4ORNLUterus();
-  G4VPhysicalVolume* ConstructUterus(G4VPhysicalVolume*, G4String, G4bool);
- 
-private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
-};
-#endif

examples/advanced/human_phantom/include/G4ParameterisedBreast.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 G4ParameterisedBreast_h
-#define G4ParameterisedBreast_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-class G4VPhysicalVolume;
-class G4LogicalVolume;
-class G4HumanPhantomSDBreast;
-
-class G4ParameterisedBreast
-{
-public:
-  G4ParameterisedBreast();
-  ~G4ParameterisedBreast();
-  G4VPhysicalVolume* ConstructBreast(G4VPhysicalVolume*, G4String, G4bool);
-
-private:
-  G4HumanPhantomSDBreast* breastSD;
-};
-#endif

examples/advanced/human_phantom/include/G4PhantomBuilder.hh

@@ -36,79 +36,76 @@
 #define G4PhantomBuilder_h 1
 
 #include "G4VPhysicalVolume.hh"
-#include "G4VPhantomBuilder.hh"
+#include "G4BasePhantomBuilder.hh"
 #include "globals.hh"
 
-class G4VPhantomBuilder;
+class G4BasePhantomBuilder;
 class G4VPhysicalVolume;
 class G4VBodyFactory;
-class G4PhantomBuilder: public G4VPhantomBuilder
+class G4PhantomBuilder: public G4BasePhantomBuilder
 {
 public:
   G4PhantomBuilder();
   ~G4PhantomBuilder();
 
-  void BuildWorld();
+  void BuildHead(const G4String&,G4bool,G4bool);
+  void BuildTrunk(const G4String&,G4bool,G4bool);
+  void BuildLeftLeg(const G4String&,G4bool,G4bool);
+  void BuildRightLeg(const G4String&,G4bool,G4bool);
 
-  void BuildHead(G4bool);
-  void BuildTrunk(G4bool);
-  void BuildLegs(G4bool);
-  void BuildNeck(G4bool);
-
-  void BuildUpperSpine(G4bool);
-  void BuildMiddleLowerSpine(G4bool);
-  void BuildLegBone(G4bool);
-  void BuildArmBone(G4bool);
-  void BuildSkull(G4bool);
-//  void BuildRibCage(G4bool);
-  void BuildPelvis(G4bool);
-//  void BuildScapulae(G4bool);
+  void BuildUpperSpine(const G4String&,G4bool,G4bool);
+  void BuildMiddleLowerSpine(const G4String&,G4bool,G4bool);
+  void BuildLeftLegBone(const G4String&,G4bool,G4bool);
+  void BuildRightLegBone(const G4String&,G4bool,G4bool);
+  void BuildLeftArmBone(const G4String&,G4bool,G4bool);
+  void BuildRightArmBone(const G4String&,G4bool,G4bool);
+  void BuildSkull(const G4String&,G4bool,G4bool);
+  void BuildRibCage(const G4String&,G4bool,G4bool);
+  void BuildPelvis(const G4String&,G4bool,G4bool);
+  void BuildLeftScapula(const G4String&,G4bool,G4bool); 
+  void BuildRightScapula(const G4String&,G4bool,G4bool);
+  void BuildLeftAdrenal(const G4String&,G4bool,G4bool);  
+  void BuildRightAdrenal(const G4String&,G4bool,G4bool); 
 //  void BuildClavicles(G4bool);
 
-virtual void BuildBreast(G4bool)= 0;
-virtual void BuildParameterisedBreast(G4bool) = 0;
+  void BuildBrain(const G4String&,G4bool,G4bool);
 
-virtual void BuildUterus(G4bool)=0;
-virtual void BuildOvary(G4bool)=0;
+  void BuildHeart(const G4String&,G4bool,G4bool);
 
-virtual void BuildTestes(G4bool) =0;
-virtual void BuildMaleGenitalia(G4bool)=0;
+  void BuildLeftLung(const G4String&,G4bool,G4bool);
+  void BuildRightLung(const G4String&,G4bool,G4bool);
 
-  void BuildBrain(G4bool);
-
-  void BuildHeart(G4bool);
-
-  void BuildLung(G4bool);
-
-  void BuildStomach(G4bool);
-  void BuildUpperLargeIntestine(G4bool);
-  void BuildLowerLargeIntestine(G4bool);
+  void BuildStomach(const G4String&,G4bool,G4bool);
+  void BuildUpperLargeIntestine(const G4String&,G4bool,G4bool);
+  void BuildLowerLargeIntestine(const G4String&,G4bool,G4bool);
  // void BuildEsophagus(G4bool);
 
-  void BuildKidney(G4bool);
+  void BuildLeftKidney(const G4String&,G4bool,G4bool);
+  void BuildRightKidney(const G4String&,G4bool,G4bool);
  // void BuildAdrenal(G4bool);
-  void BuildLiver(G4bool);
-  void BuildPancreas(G4bool);
-  void BuildSpleen(G4bool);
-  void BuildUrinaryBladder(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(G4bool);
+  void BuildThyroid(const G4String&,G4bool,G4bool);
 
-  void SetSex(G4String);
   void SetModel(G4String);
+  void SetMotherVolume(G4VPhysicalVolume*);
 
-  G4VPhysicalVolume* GetPhantom();
+ 
+G4VPhysicalVolume* GetPhantom();
+
+protected: 
+  G4VBodyFactory* body;
 
-protected:
-  G4String sex; 
   G4String model;
-  G4bool sensitivity;
+
   G4VPhysicalVolume* motherVolume;
   G4VPhysicalVolume* headVolume;
   G4VPhysicalVolume* trunkVolume;
-  G4VPhysicalVolume* legsVolume;
-  G4VPhysicalVolume* neckVolume;
+  G4VPhysicalVolume* leftLegVolume;
+  G4VPhysicalVolume* rightLegVolume;  
   G4VPhysicalVolume* maleGenitaliaVolume;
-  G4VBodyFactory* body;
 };
 #endif

examples/advanced/human_phantom/include/G4PhantomHeadBuilder.hh

@@ -0,0 +1,69 @@
+//
+// ********************************************************************
+// * 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 G4PhantomHeadBuilder_h
+#define G4PhantomHeadBuilder_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4BasePhantomBuilder.hh"
+#include "globals.hh"
+
+class G4BasePhantomBuilder;
+class G4VPhysicalVolume;
+class G4VBodyFactory;
+class G4PhantomHeadBuilder: public G4BasePhantomBuilder
+{
+public:
+  G4PhantomHeadBuilder();
+  ~G4PhantomHeadBuilder();
+
+  void BuildHead(const G4String&,G4bool,G4bool);
+  void BuildSkull(const G4String&,G4bool,G4bool);
+  void BuildBrain(const G4String&,G4bool,G4bool);
+
+  void SetModel(G4String);
+  void SetMotherVolume(G4VPhysicalVolume*);
+
+ 
+G4VPhysicalVolume* GetPhantom();
+
+protected: 
+  G4VBodyFactory* body;
+
+  G4String model;
+
+  G4VPhysicalVolume* motherVolume;
+  G4VPhysicalVolume* headVolume;
+};
+#endif

examples/advanced/human_phantom/include/G4VBodyFactory.hh

@@ -42,51 +42,10 @@ public:
 
   G4VBodyFactory();
   virtual ~G4VBodyFactory();
-
-  virtual G4VPhysicalVolume* CreateHead(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateTrunk(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateLegs(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateNeck(G4VPhysicalVolume*,G4String,G4bool) = 0;
-
-  virtual G4VPhysicalVolume* CreateUpperSpine(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateMiddleLowerSpine(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateLegBone(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateArmBone(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateSkull(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateRibCage(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreatePelvis(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateScapulae(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateClavicles(G4VPhysicalVolume*,G4String,G4bool) = 0;
-
-  virtual G4VPhysicalVolume* CreateBreast(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateParameterisedBreast(G4VPhysicalVolume*,G4String,G4bool) = 0;
-
-  virtual G4VPhysicalVolume* CreateUterus(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateOvary(G4VPhysicalVolume*,G4String,G4bool) = 0;
-
-  virtual G4VPhysicalVolume* CreateTestes(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateMaleGenitalia(G4VPhysicalVolume*,G4String,G4bool) = 0;
-
-  virtual G4VPhysicalVolume* CreateBrain(G4VPhysicalVolume*,G4String,G4bool) = 0;
-
-  virtual G4VPhysicalVolume* CreateHeart(G4VPhysicalVolume*,G4String,G4bool) = 0;
-
-  virtual G4VPhysicalVolume* CreateLung(G4VPhysicalVolume*,G4String,G4bool) = 0;
-
-  virtual G4VPhysicalVolume* CreateStomach(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateUpperLargeIntestine(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateLowerLargeIntestine(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateEsophagus(G4VPhysicalVolume*,G4String,G4bool) = 0;
-
-  virtual G4VPhysicalVolume* CreateKidney(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateAdrenal(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateLiver(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreatePancreas(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateSpleen(G4VPhysicalVolume*,G4String,G4bool) = 0;
-  virtual G4VPhysicalVolume* CreateUrinaryBladder(G4VPhysicalVolume*,G4String,G4bool) = 0;
-
-  virtual G4VPhysicalVolume* CreateThyroid(G4VPhysicalVolume*,G4String,G4bool) = 0;
-
-
+  virtual G4VPhysicalVolume* CreateOrgan(const G4String& idFile, 
+					 G4VPhysicalVolume* motherVolume,  
+					 const G4String& colour, 
+					 G4bool solidFrame,
+					 G4bool sensitivity)=0;
 };
 #endif

examples/advanced/human_phantom/include/G4VOrgan.hh

@@ -31,20 +31,21 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4MIRDKidney_h
-#define G4MIRDKidney_h 1
+#ifndef G4VOrgan_h
+#define G4VOrgan_h 1
 
 #include "G4VPhysicalVolume.hh"
 
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 
-class G4MIRDKidney
+class G4VOrgan
 {
 public:
+  G4VOrgan();
+  virtual ~G4VOrgan();
+  virtual G4VPhysicalVolume* Construct(const G4String& volumeName,G4VPhysicalVolume* mother,  
+				       const G4String& colourName, G4bool wireFrame,G4bool sensitivity)=0;
 
-  G4MIRDKidney();
-  ~G4MIRDKidney();
-  G4VPhysicalVolume* ConstructKidney(G4VPhysicalVolume*, G4String, G4bool);
 };
 #endif

examples/advanced/human_phantom/include/G4VPhantomBuilder.hh

@@ -1,88 +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 G4VPhantomBuilder_h
-#define G4VPhantomBuilder_h 1
-
-#include "G4VPhysicalVolume.hh"
-class G4VPhysicalVolume;
-class G4VPhantomBuilder
-{
-public:
-
-  G4VPhantomBuilder();
-  virtual ~G4VPhantomBuilder();
-
-  virtual void BuildWorld() = 0;
-
-  virtual void BuildHead(G4bool) = 0;
-  virtual void BuildTrunk(G4bool) = 0;
-  virtual void BuildLegs(G4bool) = 0;
-  virtual void BuildNeck(G4bool) = 0;
-
-  virtual void BuildUpperSpine(G4bool) = 0;
-  virtual void BuildMiddleLowerSpine(G4bool) = 0;
-  virtual void BuildLegBone(G4bool) = 0;
-  virtual void BuildArmBone(G4bool) = 0;
-  virtual void BuildSkull(G4bool) = 0;
-  //virtual void BuildRibCage(G4bool) = 0;
-  virtual void BuildPelvis(G4bool) = 0;
-  //virtual void BuildScapulae(G4bool) = 0;
-  //virtual void BuildClavicles(G4bool) = 0;
-
-  virtual void BuildBrain(G4bool) = 0;
-
-  virtual void BuildHeart(G4bool) = 0;
-
-  virtual void BuildLung(G4bool) = 0;
-
-  virtual void BuildStomach(G4bool) = 0;
-  virtual void BuildUpperLargeIntestine(G4bool) = 0;
-  virtual void BuildLowerLargeIntestine(G4bool) = 0;
-  //virtual void BuildEsophagus(G4bool) = 0;
-
-  virtual void BuildKidney(G4bool) = 0;
-//  virtual void BuildAdrenal(G4bool) = 0;
-  virtual void BuildLiver(G4bool) = 0;
-  virtual void BuildPancreas(G4bool) = 0;
-  virtual void BuildSpleen(G4bool) = 0;
-  virtual void BuildUrinaryBladder(G4bool) = 0;
-
-  virtual void BuildThyroid(G4bool) = 0;
-
-  virtual void SetSex(G4String) = 0;
-  virtual void SetModel(G4String) = 0;
-
-};
-#endif

examples/advanced/human_phantom/include/G4VoxelBreastFactory.hh

@@ -23,6 +23,7 @@
 // * 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 
@@ -31,28 +32,25 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4ORNLAdrenal_h
-#define G4ORNLAdrenal_h 1
-
-#include "G4VPhysicalVolume.hh"
-
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
+#ifndef G4VoxelBreastFactory_h
+#define G4VoxelBreastFactory_h 1
 
+#include "G4VBodyFactory.hh"
+#include "G4VOrgan.hh"
+#include <map>
+class G4VBodyFactory;
 class G4VPhysicalVolume;
-class G4LogicalVolume;
+class G4VOrgan;
 
-class G4ORNLAdrenal
+class G4VoxelBreastFactory: public G4VBodyFactory
 {
 public:
-
-  G4ORNLAdrenal();
-  ~G4ORNLAdrenal();
-  G4VPhysicalVolume* ConstructAdrenal(G4VPhysicalVolume*, G4String, G4bool);
+  G4VoxelBreastFactory();
+ ~G4VoxelBreastFactory();
+  G4VPhysicalVolume* CreateOrgan(const G4String&, G4VPhysicalVolume*, 
+				 const G4String&,G4bool,G4bool);
  
 private:
-    SAXProcessor sxp;
-    ProcessingConfigurator config;
-
+  std::map<std::string,G4VOrgan*> organ; 
 };
 #endif

examples/advanced/human_phantom/include/G4VoxelLeftBreast.hh

@@ -0,0 +1,50 @@
+//
+// ********************************************************************
+// * 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 G4VoxelLeftBreast_h
+#define G4VoxelLeftBreast_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+
+class G4VPhysicalVolume;
+
+class G4VoxelLeftBreast: public G4VOrgan
+{
+public:
+  G4VoxelLeftBreast();
+  ~G4VoxelLeftBreast();
+  G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*, 
+			       const G4String&,G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4VoxelLeftBreastROGeometry.hh

@@ -32,21 +32,19 @@
 // design and code review.
 //
 
-#ifndef G4HumanPhantomROGeometry_h
-#define G4HumanPhantomROGeometry_h 
+#ifndef G4VoxelLeftBreastROGeometry_h
+#define G4VoxelLeftBreastROGeometry_h 
 
 #include "G4VReadOutGeometry.hh"
 
-class G4HumanPhantomROGeometry : public G4VReadOutGeometry
+class G4VoxelLeftBreastROGeometry : public G4VReadOutGeometry
 {
 public:
-  G4HumanPhantomROGeometry(G4String aString);
-  ~G4HumanPhantomROGeometry();
+  G4VoxelLeftBreastROGeometry(G4String aString);
+  ~G4VoxelLeftBreastROGeometry();
 
 private:
   G4VPhysicalVolume* Build();
-
-private:
   G4VPhysicalVolume* ROvoxel_phys;
 };
 #endif

examples/advanced/human_phantom/include/G4VoxelLeftBreastSD.hh

@@ -31,19 +31,19 @@
 // with the design in a forthcoming publication, and subject to a 
 // design and code review.
 //
-#ifndef G4HumanPhantomSDBreast_h
-#define G4HumanPhantomSDBreast_h 1
+#ifndef G4VoxelLeftBreastSD_h
+#define G4VoxelLeftBreastSD_h 1
 
 #include "G4VSensitiveDetector.hh"
 
 //class G4Step;
 //class G4HCofThisEvent;
 
-class G4HumanPhantomSDBreast : public G4VSensitiveDetector
+class G4VoxelLeftBreastSD : public G4VSensitiveDetector
 {
   public:
-      G4HumanPhantomSDBreast(G4String);
-     ~G4HumanPhantomSDBreast();
+      G4VoxelLeftBreastSD(G4String);
+     ~G4VoxelLeftBreastSD();
 
       void Initialize(G4HCofThisEvent*);
       G4bool ProcessHits(G4Step*, G4TouchableHistory*);

examples/advanced/human_phantom/include/G4VoxelRightBreast.hh

@@ -0,0 +1,50 @@
+//
+// ********************************************************************
+// * 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 G4VoxelRightBreast_h
+#define G4VoxelRightBreast_h 1
+
+#include "G4VPhysicalVolume.hh"
+#include "G4VOrgan.hh"
+
+class G4VPhysicalVolume;
+
+class G4VoxelRightBreast: public G4VOrgan
+{
+public:
+  G4VoxelRightBreast();
+  ~G4VoxelRightBreast();
+  G4VPhysicalVolume* Construct(const G4String&, G4VPhysicalVolume*, 
+			       const G4String&,G4bool, G4bool);
+};
+#endif

examples/advanced/human_phantom/include/G4VoxelRightBreastROGeometry.hh

@@ -0,0 +1,50 @@
+//
+// ********************************************************************
+// * 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 G4VoxelRightBreastROGeometry_h
+#define G4VoxelRightBreastROGeometry_h 
+
+#include "G4VReadOutGeometry.hh"
+
+class G4VoxelRightBreastROGeometry : public G4VReadOutGeometry
+{
+public:
+  G4VoxelRightBreastROGeometry(G4String aString);
+  ~G4VoxelRightBreastROGeometry();
+
+private:
+  G4VPhysicalVolume* Build();
+  G4VPhysicalVolume* ROvoxel_phys;
+};
+#endif

examples/advanced/human_phantom/include/G4VoxelRightBreastSD.hh

@@ -0,0 +1,53 @@
+//
+// ********************************************************************
+// * 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
+