Import Geant4 11.3.0 source tree
This commit is contained in:
@@ -173,14 +173,14 @@ G4HnMessenger::CreateSetAxisLogCommand(unsigned int idim)
|
||||
G4String commandName = "set" + axis + "axisLog";
|
||||
G4String guidance = "Activate " + axis + "-axis log scale for plotting of the ";
|
||||
|
||||
auto command = CreateCommand<G4UIcommand>(commandName, guidance);
|
||||
auto command = CreateCommand<G4UIcommand>(std::move(commandName), guidance);
|
||||
command->AvailableForStates(G4State_PreInit, G4State_Idle);
|
||||
|
||||
// Add Id parameter
|
||||
AddIdParameter(*command);
|
||||
|
||||
auto parAxisLog = new G4UIparameter("axis", 'b', false);
|
||||
guidance = GetObjectType() + " " + axis + "-axis log scale";
|
||||
guidance = GetObjectType() + " " + std::move(axis) + "-axis log scale";
|
||||
parAxisLog->SetGuidance(guidance.c_str());
|
||||
command->SetParameter(parAxisLog);
|
||||
|
||||
|
||||
@@ -286,7 +286,7 @@ void G4NtupleBookingManager::SetFileName(
|
||||
// Save the fileName in booking
|
||||
// If extension is still missing (possible with generic manager),
|
||||
// it will be completed with the default one at OpenFile
|
||||
ntupleBooking->fFileName = ntupleFileName;
|
||||
ntupleBooking->fFileName = std::move(ntupleFileName);
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
@@ -426,7 +426,7 @@ void G4NtupleBookingManager::SetFileType(const G4String& fileType)
|
||||
}
|
||||
|
||||
// Save the info in ntuple description
|
||||
ntupleBooking->fFileName = ntupleFileName;
|
||||
ntupleBooking->fFileName = std::move(ntupleFileName);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ void G4NtupleMessenger::CreateColumnCmds()
|
||||
G4String guidance = "Create ntuple column";
|
||||
name.insert(6, 1, colType);
|
||||
guidance.insert(7, 1, colType);
|
||||
auto cmd = CreateCommand<G4UIcmdWithAString>(name, guidance);
|
||||
auto cmd = CreateCommand<G4UIcmdWithAString>(std::move(name), std::move(guidance));
|
||||
fCreateColumnCmds[colType] = std::move(cmd);
|
||||
}
|
||||
}
|
||||
@@ -221,15 +221,15 @@ void G4NtupleMessenger::SetNewValue(G4UIcommand* command, G4String newValues)
|
||||
// commands without Id parameter
|
||||
|
||||
if ( command == fCreateCmd.get() ) {
|
||||
auto name = parameters[counter++];
|
||||
auto title = parameters[counter++];
|
||||
const auto& name = parameters[counter++];
|
||||
const auto& title = parameters[counter++];
|
||||
fTmpNtupleId = fManager->CreateNtuple(name, title);
|
||||
return;
|
||||
}
|
||||
|
||||
for (const auto& [colType, checkCommand] : fCreateColumnCmds) {
|
||||
if ( command == checkCommand.get() ) {
|
||||
auto name = parameters[counter++];
|
||||
const auto& name = parameters[counter++];
|
||||
switch (colType) {
|
||||
case 'I':
|
||||
fManager->CreateNtupleIColumn(fTmpNtupleId, name);
|
||||
@@ -260,7 +260,7 @@ void G4NtupleMessenger::SetNewValue(G4UIcommand* command, G4String newValues)
|
||||
auto id = G4UIcommand::ConvertToInt(parameters[counter++]);
|
||||
|
||||
if ( command == fDeleteCmd.get() ) {
|
||||
auto keepSetting = G4UIcommand::ConvertToBool(parameters[counter++]);
|
||||
const auto& keepSetting = G4UIcommand::ConvertToBool(parameters[counter++]);
|
||||
fManager->DeleteNtuple(id, keepSetting);
|
||||
return;
|
||||
}
|
||||
@@ -276,7 +276,7 @@ void G4NtupleMessenger::SetNewValue(G4UIcommand* command, G4String newValues)
|
||||
}
|
||||
|
||||
if ( command == fListCmd.get() ) {
|
||||
auto onlyIfActive = G4UIcommand::ConvertToBool(parameters[0]);
|
||||
const auto& onlyIfActive = G4UIcommand::ConvertToBool(parameters[0]);
|
||||
fManager->ListNtuple(onlyIfActive);
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user