Changeset 1340 for trunk/source/physics_lists/builders/include/G4DataQuestionaire.hh

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/physics_lists/builders/include/G4DataQuestionaire.hh (modified) (4 diffs)

trunk/source/physics_lists/builders/include/G4DataQuestionaire.hh

@@ -33 +33 @@
 #include "G4VPiKBuilder.hh"
 
-enum G4DataType {no, photon, neutron, radioactive, lowenergy, optical};
+enum G4DataType {no, photon, neutron, radioactive, lowenergy, optical, neutronxs};
 class G4DataQuestionaire
 {
   public: 
-    G4DataQuestionaire(G4DataType t1=no, G4DataType t2=no, G4DataType t3=no, G4DataType t4=no, G4DataType t5=no) 
+    G4DataQuestionaire(G4DataType t1=no, G4DataType t2=no, G4DataType t3=no, 
+                       G4DataType t4=no, G4DataType t5=no, G4DataType t6=no) 
     {
       G4cout << G4endl;
@@ -43 +44 @@
       //      G4cout <<G4endl<<G4endl;
       // G4cout << "##### the input "<<t1<<" "<<t2<<" "<<t3<<" "<<t4<<G4endl;
-      for(G4int i=0; i<5; i++)
+      for(G4int i=0; i<6; ++i)
       {
         G4DataType t(no);
@@ -51 +52 @@
         if(i==3) t=t4;
         if(i==4) t=t5;
+        if(i==5) t=t6;
         switch(t)
         {
@@ -98 +100 @@
             break;
           case optical:
-            if(!getenv("G4LEDATA") )
+            /*
+            if(!getenv("G4REALSURFACEDATA") )
             {
               G4cout << "Data describing surface propeties for optical photons are needed."<<G4endl;
               G4cout << "Please set the environmental variable G4REALSURFACEDATA"<<G4endl;
               G4cout << "to point to your RealSurface directory."<<G4endl;
+              G4cout << "Data are available from the Geant4 download page."<<G4endl;
+              G4Exception("G4DataQuestionaire", "007", FatalException,
+                          "Fatal error: Missing mandatory data for this simulation engine");
+            }
+            */
+            break;
+          case neutronxs:
+            if(!getenv("G4NEUTRONXSDATA") )
+            {
+              G4cout << "G4NEUTRONXS are needed."<<G4endl;
+              G4cout << "Please set the environmental variable G4NEUTRONXSDATA"<<G4endl;
+              G4cout << "to point to your G4NEUTRONXS directory."<<G4endl;
               G4cout << "Data are available from the Geant4 download page."<<G4endl;
               G4Exception("G4DataQuestionaire", "007", FatalException,