Changeset 1230 for trunk/examples/advanced/xray_fluorescence/src/XrayFluoDetectorConstruction.cc

Timestamp:

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

Author:

garnier

Message:

update to geant4.9.3

File:

• trunk/examples/advanced/xray_fluorescence/src/XrayFluoDetectorConstruction.cc (modified) (12 diffs)

trunk/examples/advanced/xray_fluorescence/src/XrayFluoDetectorConstruction.cc

@@ -59 +59 @@
 
 
-#include "G4Region.hh"
-#include "G4RegionStore.hh"
+//#include "G4Region.hh"
+//#include "G4RegionStore.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -66 +66 @@
 
 XrayFluoDetectorConstruction::XrayFluoDetectorConstruction()
-  : detectorType(0),sampleGranularity(false), phaseSpaceFlag(false),
+  : aNavigator(0), detectorType(0),sampleGranularity(false), phaseSpaceFlag(false),
     DeviceSizeX(0), DeviceSizeY(0),DeviceThickness(0),
     solidWorld(0),logicWorld(0),physiWorld(0),
@@ -83 +83 @@
 { 
   materials = XrayFluoNistMaterials::GetInstance();
+
+  aNavigator = new G4Navigator();
  
   DefineDefaultMaterials();
@@ -89 +91 @@
   NbOfPixelColumns  =  1; // should be 1
   NbOfPixels        =  NbOfPixelRows*NbOfPixelColumns;
-  PixelSizeXY       =  std::sqrt(40.) * mm; // should be std::sqrt(40) * mm
+  PixelSizeXY       =  7 * cm;// should be std::sqrt(40) * mm
   PixelThickness = 3.5 * mm; //should be 3.5 mm
 
@@ -95 +97 @@
   G4cout << "PixelSizeXY(cm): "<< PixelSizeXY/cm << G4endl;
 
-  ContactSizeXY     = std::sqrt(40.) * mm; //std::sqrt(40) * mm; //should be the same as PixelSizeXY
+  ContactSizeXY     = PixelSizeXY; //std::sqrt(40) * mm; //should be the same as PixelSizeXY
   SampleThickness = 4 * mm;
   SampleSizeXY = 3. * cm;
@@ -132 +134 @@
   ComputeApparateParameters();
 
-  G4String regName = "SampleRegion";
-  sampleRegion = new G4Region(regName);  
+  // G4String regName = "SampleRegion";
+  //sampleRegion = new G4Region(regName);  
 
   if (!phaseSpaceFlag) SetDetectorType(defaultDetectorType);
@@ -205 +207 @@
   //define materials of the apparate
 
-  sampleMaterial = materials->GetMaterial("Mars1");
+  sampleMaterial = materials->GetMaterial("Dolorite");
   Dia1Material = materials->GetMaterial("G4_Pb");
   Dia3Material = materials->GetMaterial("Galactic");
-  pixelMaterial = materials->GetMaterial("G4_Si");
-  OhmicPosMaterial = materials->GetMaterial("G4_Cu");
+  pixelMaterial = materials->GetMaterial("SiLi");
+  //pixelMaterial = materials->GetMaterial(detectorType->GetDetectorMaterial());
+  OhmicPosMaterial = materials->GetMaterial("Cu");
   OhmicNegMaterial = materials->GetMaterial("G4_Pb");
   defaultMaterial = materials->GetMaterial("Galactic");
@@ -246 +249 @@
   //ComputeApparateParameters();
   
-  //world
+  //world and associated navigator
   
   solidWorld = new G4Box("World",                               //its name
@@ -261 +264 @@
                                  false,                 //no boolean operation
                                  0);                    //copy number
+
+  aNavigator->SetWorldVolume(physiWorld);
+
  
   //HPGeDetector
@@ -378 +384 @@
           PixelCopyNb += PixelCopyNb; 
           G4cout << "PixelCopyNb: " << PixelCopyNb << G4endl;
-      }
+        }
       
       }
@@ -611 +617 @@
   // cut per region
   
-  logicSample->SetRegion(sampleRegion);
-  sampleRegion->AddRootLogicalVolume(logicSample);
+  //logicSample->SetRegion(sampleRegion);
+  //sampleRegion->AddRootLogicalVolume(logicSample);
   
 
@@ -758 +764 @@
 
 
-    G4cout << "Material Change in Progress" << newMaterial << G4endl;
+    G4cout << "Material Change in Progress " << newMaterial << G4endl;
     sampleMaterial = materials->GetMaterial(newMaterial);
     logicSample->SetMaterial(sampleMaterial);