Import Geant4 10.1.0 source tree

source/intercoms/src/G4UImanager.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4UImanager.cc 77651 2013-11-27 08:47:55Z gcosmo $
+// $Id: G4UImanager.cc 85249 2014-10-27 08:28:57Z gcosmo $
 //
 //
 // ---------------------------------------------------------------------
@@ -341,7 +341,20 @@ void G4UImanager::ForeachS(const char* valueList)
     c1 += " ";
     c1 += ca;
   }
-  Foreach(mf,vn,c1);
+
+  G4String aliasValue = c1;
+  if(aliasValue(0)=='"')
+  {
+    G4String strippedValue;
+    if(aliasValue(aliasValue.length()-1)=='"')
+    { strippedValue = aliasValue(1,aliasValue.length()-2); }
+    else
+    { strippedValue = aliasValue(1,aliasValue.length()-1); }
+    aliasValue = strippedValue;
+  }
+
+//  Foreach(mf,vn,c1);
+  Foreach(mf,vn,aliasValue);
 }
 
 void G4UImanager::Foreach(const char * macroFile,const char * variableName,
@@ -356,7 +369,7 @@ void G4UImanager::Foreach(const char * macroFile,const char * variableName,
     vl += " ";
     vl += cd;
     SetAlias(vl);
-    ExecuteMacroFile(macroFile);
+    ExecuteMacroFile(FindMacroPath(macroFile));
   }
 }
 
@@ -705,6 +718,16 @@ void G4UImanager::SetUpForAThread(G4int tId)
   threadCout->SetIgnoreCout(igThreadID);
 }
 
+void G4UImanager::SetUpForSpecialThread(G4String pref)
+{
+    threadID = G4Threading::GENERICTHREAD_ID;
+    G4Threading::G4SetThreadId(threadID);
+    G4iosInitialization();
+    threadCout = new G4MTcoutDestination(threadID);
+    threadCout->SetPrefixString(pref);
+    threadCout->SetIgnoreCout(igThreadID);
+}
+
 void G4UImanager::SetCoutFileName(const G4String& fileN, G4bool ifAppend)
 {
   // for sequential mode, ignore this method.
@@ -760,3 +783,10 @@ void G4UImanager::SetThreadIgnore(G4int tid)
   threadCout->SetIgnoreCout(tid);
 }
 
+void G4UImanager::SetThreadIgnoreInit(G4bool flg)
+{
+  // for sequential mode, ignore this method.
+  if(threadID<0) { return; }
+  threadCout->SetIgnoreInit(flg);
+}
+