Changeset 1230 for trunk/examples/advanced/human_phantom/src

Timestamp:

Jan 8, 2010, 3:02:48 PM (16 years ago)

Author:

garnier

Message:

update to geant4.9.3

Location:

trunk/examples/advanced/human_phantom/src

Files:

• G4HumanPhantomHit.cc (modified) (1 diff)
• G4MIRDHead.cc (modified) (1 diff)
• G4MIRDHeart.cc (modified) (1 diff)
• G4MIRDLiver.cc (modified) (3 diffs)
• G4MIRDSpleen.cc (modified) (1 diff)
• G4MIRDTestes.cc (modified) (3 diffs)
• G4ORNLFemaleBodyFactory.cc (modified) (3 diffs)
• G4ORNLMaleBodyFactory.cc (modified) (3 diffs)

trunk/examples/advanced/human_phantom/src/G4HumanPhantomHit.cc

@@ -26 +26 @@
 //
 // $Id: G4HumanPhantomHit.cc,v 1.11 2007/05/15 14:45:35 guatelli Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 

trunk/examples/advanced/human_phantom/src/G4MIRDHead.cc

@@ -33 +33 @@
 //
 #include "G4MIRDHead.hh"
-//#include "G4Processor/GDMLProcessor.h"
 #include "globals.hh"
 #include "G4HumanPhantomMaterial.hh"

trunk/examples/advanced/human_phantom/src/G4MIRDHeart.cc

@@ -136 +136 @@
   return physHeart;
   */
+  return 0;
 }

trunk/examples/advanced/human_phantom/src/G4MIRDLiver.cc

@@ -48 +48 @@
 #include "G4Box.hh"
 #include <cmath>
+
 G4MIRDLiver::G4MIRDLiver()
 {
@@ -54 +55 @@
 G4MIRDLiver::~G4MIRDLiver()
 {
-
 }
 
 G4VPhysicalVolume* G4MIRDLiver::Construct(const G4String&,G4VPhysicalVolume*,
-                                    const G4String&, G4bool, G4bool)
+                                          const G4String&, G4bool, G4bool)
 {
   G4cout << "MIRD Liver is not available yet !!!" << G4endl;
@@ -145 +145 @@
 
 // return physLiver;
+  return 0;
 }

trunk/examples/advanced/human_phantom/src/G4MIRDSpleen.cc

@@ -34 +34 @@
 #include "G4MIRDSpleen.hh"
 
-#include "G4Processor/GDMLProcessor.h"
 #include "globals.hh"
 #include "G4SDManager.hh"

trunk/examples/advanced/human_phantom/src/G4MIRDTestes.cc

@@ -34 +34 @@
 #include "G4MIRDTestes.hh"
 
-#include "G4Processor/GDMLProcessor.h"
 #include "globals.hh"
 #include "G4SDManager.hh"
@@ -45 +44 @@
 G4MIRDTestes::~G4MIRDTestes()
 {
-  sxp.Finalize();
 }
 
@@ -51 +49 @@
 {
   // Initialize GDML Processor
-  sxp.Initialize();
-  config.SetURI( "gdmlData/"+sex+"/MIRDTestes.gdml" );
-  config.SetSetupName( "Default" );
-  sxp.Configure( &config );
+  parser.Read( "gdmlData/"+sex+"/MIRDTestes.gdml" ); 
 
-  // Run GDML Processor
-  sxp.Run();
- 
+  G4LogicalVolume* logicTestes = parser.GetVolume("TestesVolume");
 
-  G4LogicalVolume* logicTestes = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume("TestesVolume");
-
-  G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("TestesPos");
-  G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("TestesRot");
+  G4ThreeVector position = parser.GetPosition("TestesPos");
+  G4ThreeVector rot = parser.GetRotation("TestesRot");
+  G4RotationMatrix* rm = new G4RotationMatrix();
+  rm->rotateX(rot.x()); rm->rotateY(rot.y()); rm->rotateZ(rot.z()); 
   
   // Define rotation and position here!

trunk/examples/advanced/human_phantom/src/G4ORNLFemaleBodyFactory.cc

@@ -35 +35 @@
 #include "G4ORNLFemaleBodyFactory.hh"
 #include "G4PhysicalVolumeStore.hh"
-#include "G4Processor/GDMLProcessor.h"
+#include "G4GDMLParser.hh"
 #include "globals.hh"
 #include "G4SDManager.hh"
 #include "G4VisAttributes.hh"
 #include "G4HumanPhantomColour.hh"
+
 G4ORNLFemaleBodyFactory::G4ORNLFemaleBodyFactory()
 {
-
 }
 
 G4ORNLFemaleBodyFactory::~G4ORNLFemaleBodyFactory()
 { 
-  //sxp.Finalize();
 }
 
@@ -55 +54 @@
 {
   G4cout<< "ORNLBodyFactory: "<< "gdmlData/Female/ORNL"<< gdmlFile <<".gdml" << G4endl;
-  SAXProcessor sxp;
-  ProcessingConfigurator config;
-  // Initialize GDML Processor
-  sxp.Initialize();
-  G4String name = "gdmlData/Female/ORNL"+ gdmlFile + ".gdml";
-  config.SetURI(name);
-  G4cout << "config.SetURI(name);" << G4endl;
-  config.SetSetupName( "Default" );
-  G4cout << "config.SetSetUpName;" << G4endl;
-  sxp.Configure( &config );
-  G4cout << "sxp.Configure( &config );" << G4endl;
-  // Run GDML Processor
-  sxp.Run(); 
-  G4cout << "sxp.Run();" << G4endl;
+
+  G4GDMLParser parser;
+  G4String filename = "gdmlData/Female/ORNL"+ gdmlFile + ".gdml";
+  parser.Read(filename);
  
   G4String logicalVolumeName = gdmlFile + "Volume"; 
-  G4LogicalVolume* logicOrgan = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume(logicalVolumeName);
+  G4LogicalVolume* logicOrgan = parser.GetVolume(logicalVolumeName);
+  G4ThreeVector position = parser.GetPosition("OrganPos");
+  G4ThreeVector rot = parser.GetRotation("OrganRot");
+  G4RotationMatrix* rm = new G4RotationMatrix();
+  rm->rotateX(rot.x()); rm->rotateY(rot.y()); rm->rotateZ(rot.z()); 
 
-  G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("OrganPos");
-  G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("OrganRot");
- 
-  G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume());
+  G4PhysicalVolumeStore::DeRegister(parser.GetWorldVolume());
  
   //   sxp.Finalize();
@@ -111 +101 @@
   logicOrgan->SetVisAttributes(organVisAtt);
   }
-  G4cout << "Organ created !!!!!!  from " << name <<G4endl;
-  sxp.Finalize();
+  G4cout << "Organ created !!!!!!  from " << filename <<G4endl;
 
   return physOrgan;

trunk/examples/advanced/human_phantom/src/G4ORNLMaleBodyFactory.cc

@@ -35 +35 @@
 #include "G4ORNLMaleBodyFactory.hh"
 #include "G4PhysicalVolumeStore.hh"
-#include "G4Processor/GDMLProcessor.h"
+#include "G4GDMLParser.hh"
 #include "globals.hh"
 #include "G4SDManager.hh"
 #include "G4VisAttributes.hh"
 #include "G4HumanPhantomColour.hh"
-#include "Saxana/SAXProcessor.h"
-#include "Saxana/ProcessingConfigurator.h"
+
 G4ORNLMaleBodyFactory::G4ORNLMaleBodyFactory()
 {
@@ -55 +54 @@
 {
 
- G4cout<< "ORNLBodyFactory: "<< "gdmlData/Male/ORNL"<< gdmlFile <<".gdml" << G4endl;
-  SAXProcessor sxp;
-  ProcessingConfigurator config;
-  // Initialize GDML Processor
-  sxp.Initialize();
-  G4String name = "gdmlData/Male/ORNL"+ gdmlFile + ".gdml";
-  config.SetURI(name);
-  G4cout << "config.SetURI(name);" << G4endl;
-  config.SetSetupName( "Default" );
-  G4cout << "config.SetSetUpName;" << G4endl;
-  sxp.Configure( &config );
-  G4cout << "sxp.Configure( &config );" << G4endl;
-  // Run GDML Processor
-  sxp.Run(); 
-  G4cout << "sxp.Run();" << G4endl;
+  G4cout<< "ORNLBodyFactory: "<< "gdmlData/Male/ORNL"<< gdmlFile <<".gdml" << G4endl;
+  G4GDMLParser parser;
+  G4String filename = "gdmlData/Male/ORNL"+ gdmlFile + ".gdml";
+  parser.Read(filename);
+
+  G4String logicalVolumeName = gdmlFile + "Volume"; 
+  G4LogicalVolume* logicOrgan = parser.GetVolume(logicalVolumeName);
+  G4ThreeVector position = parser.GetPosition("OrganPos");
+  G4ThreeVector rot = parser.GetRotation("OrganRot");
+  G4RotationMatrix* rm = new G4RotationMatrix();
+  rm->rotateX(rot.x()); rm->rotateY(rot.y()); rm->rotateZ(rot.z()); 
+
+  G4PhysicalVolumeStore::DeRegister(parser.GetWorldVolume());
  
-  G4String logicalVolumeName = gdmlFile + "Volume"; 
-  G4LogicalVolume* logicOrgan = (G4LogicalVolume *)GDMLProcessor::GetInstance()->GetLogicalVolume(logicalVolumeName);
-
-  G4ThreeVector position = (G4ThreeVector)*GDMLProcessor::GetInstance()->GetPosition("OrganPos");
-  G4RotationMatrix* rm = (G4RotationMatrix*)GDMLProcessor::GetInstance()->GetRotation("OrganRot");
- 
-  G4PhysicalVolumeStore::DeRegister((G4VPhysicalVolume*)GDMLProcessor::GetInstance()->GetWorldVolume());
- 
-  //   sxp.Finalize();
   // Define rotation and position here!
   G4VPhysicalVolume* physOrgan = new G4PVPlacement(rm,position,
@@ -102 +90 @@
   logicOrgan->SetVisAttributes(organVisAtt);
 
-  G4cout << "Organ created !!!!!!  from " << name <<G4endl;
-  sxp.Finalize();
+  G4cout << "Organ created !!!!!!  from " << filename <<G4endl;
 
   return physOrgan;
 }
-
-