Import Geant4 10.5.1 source tree

source/analysis/History

@@ -16,6 +16,9 @@ committal in the SVN repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+March 11, 2019 G. Cosmo (analysis-V10-04-11)
+- Fixed typos in printouts in G4P1Messenger, G4PlotMessenger, G4PlotParameters.
+
 November 28, 2018 I. Hrivnacova (analysis-V10-04-10)
 - Use the same mutex in Root pntuple add_row and end_fill.
   This should fix occassional failures of tests in MT mode.

source/analysis/management/src/G4AnalysisMessengerHelper.cc

@@ -63,7 +63,7 @@ G4String ObjectType(const G4String& hnType)
 
 //_____________________________________________________________________________
 void Replace(std::string& str, const std::string& from, const std::string& to) {
-  // Replace all occurences of from string
+  // Replace all occurrences of from string
   if (from.empty()) return;
   size_t start_pos = 0;
   while ((start_pos = str.find(from, start_pos)) != std::string::npos) {

source/analysis/management/src/G4P1Messenger.cc

@@ -105,7 +105,7 @@ void G4P1Messenger::CreateP1Cmd()
   auto p1xValFcn0 = new G4UIparameter("xvalFcn0", 's', true);
   G4String fcnxGuidance = "The function applied to filled x-values (log, log10, exp, none).\n";
   fcnxGuidance += "Note that the unit parameter cannot be omitted in this case,\n";
-  fcnxGuidance += "but none value should be used insted.";
+  fcnxGuidance += "but none value should be used instead.";
   p1xValFcn0->SetGuidance(fcnxGuidance);
   p1xValFcn0->SetParameterCandidates("log log10 exp none");
   p1xValFcn0->SetDefaultValue("none");
@@ -115,7 +115,7 @@ void G4P1Messenger::CreateP1Cmd()
   p1xValBinScheme0->SetParameterCandidates("linear log");
   binSchemeGuidance 
     += "Note that the unit and fcn parameters cannot be omitted in this case,\n";
-  binSchemeGuidance += "but none value should be used insted.";
+  binSchemeGuidance += "but none value should be used instead.";
   p1xValBinScheme0->SetGuidance(binSchemeGuidance);
   p1xValBinScheme0->SetDefaultValue("linear");
   
@@ -136,7 +136,7 @@ void G4P1Messenger::CreateP1Cmd()
   auto p1yValFcn0 = new G4UIparameter("yvalFcn0", 's', true);
   G4String fcnyGuidance = "The function applied to filled y-values (log, log10, exp, none).\n";
   fcnyGuidance += "Note that the unit parameter cannot be omitted in this case,\n";
-  fcnyGuidance += "but none value should be used insted.";
+  fcnyGuidance += "but none value should be used instead.";
   p1yValFcn0->SetGuidance(fcnyGuidance);
   p1yValFcn0->SetParameterCandidates("log log10 exp none");
   p1yValFcn0->SetDefaultValue("none");
@@ -183,7 +183,7 @@ void G4P1Messenger::SetP1Cmd()
   p1xValFcn->SetParameterCandidates("log log10 exp none");
   G4String fcnxGuidance = "The function applied to filled x-values (log, log10, exp, none).\n";
   fcnxGuidance += "Note that the unit parameter cannot be omitted in this case,\n";
-  fcnxGuidance += "but none value should be used insted.";
+  fcnxGuidance += "but none value should be used instead.";
   p1xValFcn->SetGuidance(fcnxGuidance);
   p1xValFcn->SetDefaultValue("none");
  
@@ -192,7 +192,7 @@ void G4P1Messenger::SetP1Cmd()
   p1xValBinScheme->SetParameterCandidates("linear log");
   binSchemeGuidance 
     += "Note that the unit and fcn parameters cannot be omitted in this case,\n";
-  binSchemeGuidance += "but none value should be used insted.";
+  binSchemeGuidance += "but none value should be used instead.";
   p1xValBinScheme->SetGuidance(binSchemeGuidance);
   p1xValBinScheme->SetDefaultValue("linear");
   
@@ -210,7 +210,7 @@ void G4P1Messenger::SetP1Cmd()
   p1yValFcn->SetParameterCandidates("log log10 exp none");
   G4String fcnyGuidance = "The function applied to filled y-values (log, log10, exp, none).\n";
   fcnyGuidance += "Note that the unit parameter cannot be omitted in this case,\n";
-  fcnyGuidance += "but none value should be used insted.";
+  fcnyGuidance += "but none value should be used instead.";
   p1yValFcn->SetGuidance(fcnyGuidance);
   p1yValFcn->SetDefaultValue("none");
  

source/analysis/management/src/G4PlotMessenger.cc

@@ -112,11 +112,11 @@ void G4PlotMessenger::SetLayoutCmd()
   fSetLayoutCmd = G4Analysis::make_unique<G4UIcommand>("/analysis/plot/setLayout", this);
   // Guidance text:
   // Set page layout (number of columns and rows per page).
-  //    Suported layouts: 
+  //    Supported layouts: 
   //    columns = 1 .. maxValueAllowed
   //    rows    = 1 .. maxValueAllowed, and >= columns
   fSetLayoutCmd->SetGuidance("Set page layout (number of columns and rows per page).");
-  fSetLayoutCmd->SetGuidance("   Suported layouts: ");
+  fSetLayoutCmd->SetGuidance("   Supported layouts: ");
   G4String guidance = "  columns = 1 .. ";
   guidance.append(osMaxColumns.str());
   fSetLayoutCmd->SetGuidance(guidance);

source/analysis/management/src/G4PlotParameters.cc

@@ -77,7 +77,7 @@ void G4PlotParameters::SetLayout(G4int columns, G4int rows)
     G4ExceptionDescription description;
     description 
       << "Layout: " << columns << " x " << rows << " was ignored." << G4endl
-      << "Suported layouts: " << G4endl
+      << "Supported layouts: " << G4endl
       << "  columns <= rows" << G4endl
       << "  columns = 1 .. " << fMaxColumns << G4endl
       << "  rows    = 1 .. " << fMaxRows << G4endl;