simhadteam team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21
committer: Daniel Cussol <cussol@xxxxxxxx>
branch nick: G4LPC
timestamp: Tue 2013-04-30 13:17:02 +0200
message:
  Resolution du conflit dans "G4LPCDetectorConstruction.cc".
modified:
  src/G4LPCDetectorConstruction.cc


--
lp:simulationshadrontherapie/g4lpc
https://code.launchpad.net/~simhadteam/simulationshadrontherapie/G4LPC

Your team Simulateurs pour la Hadronthérapie is subscribed to branch lp:simulationshadrontherapie/g4lpc.
To unsubscribe from this branch go to https://code.launchpad.net/~simhadteam/simulationshadrontherapie/G4LPC/+edit-subscription

=== modified file 'src/G4LPCDetectorConstruction.cc'
--- src/G4LPCDetectorConstruction.cc	2012-07-02 08:46:22 +0000
+++ src/G4LPCDetectorConstruction.cc	2013-04-30 11:17:02 +0000
@@ -1698,8 +1698,8 @@
     
        //------ Quelques impressions sur les mat�aux
 
-  //G4NistManager* man = G4NistManager::Instance();
-  //G4Material* H2O = man->FindOrBuildMaterial("G4_WATER");
+  G4NistManager* man = G4NistManager::Instance();
+  G4Material* H2O = man->FindOrBuildMaterial("G4_WATER");
   //G4Material* G4_Air = man->FindOrBuildMaterial("G4_AIR");
 
   G4Material* Vide = 
@@ -1719,16 +1719,17 @@
     out << G4endl;
     }
     
-//    out << "\n-----> Liste des materiaux NIST <-----" << "\n";
-//    vector<G4String> nistNames=man->GetNistMaterialNames();
-//    for(G4int i=0;i<nistNames.size();i++)
-//     {
+   out << "\n-----> Liste des materiaux NIST <-----" << "\n";
+   vector<G4String> nistNames=man->GetNistMaterialNames();
+   for(G4int i=0;i<nistNames.size();i++)
+    {
+    out << nistNames[i] << endl;
 //     G4Material *mat=man->FindOrBuildMaterial(nistNames[i]);
 //     out << (*mat) << G4endl;
 //     out << "   Nb Atoms/cm^3: " << mat->GetTotNbOfAtomsPerVolume()/cm3 << G4endl;
 //     out << G4endl;
 //     //man->PrintG4Material(nistNames[i]);
-//     }
+    }
   //out << "Liste de tous les materiaux NIST : " << G4endl;
   //man->ListMaterials("all");
   out.close();
@@ -1900,11 +1901,11 @@
 if(IndexInRange(i))
  {
  G4Material *m= G4Material::GetMaterial(s);
-  if(!m)
-   {
-   G4NistManager* man = G4NistManager::Instance();
-   m=man->FindOrBuildMaterial(s,false);
-   }
+ if(!m)
+  {
+  G4NistManager* man = G4NistManager::Instance();
+  m=man->FindOrBuildMaterial(s,false);
+  }
  if(m)
   {
   SetLayerMaterial(i,m);