uniform local var names

GUI/Model/FromCore/ItemizeSimulation.cpp

@@ -379,12 +379,12 @@ InstrumentModel* GUI::FromCore::itemizeInstruments(const ISimulation& simulation
 {
     InstrumentItem* item;
 
-    if (const auto* gisasSimulation = dynamic_cast<const ScatteringSimulation*>(&simulation))
-        item = createGISASInstrumentItem(*gisasSimulation);
-    else if (const auto* offspecSimulation = dynamic_cast<const OffspecSimulation*>(&simulation))
-        item = createOffspecInstrumentItem(*offspecSimulation);
-    else if (const auto* spec_simulation = dynamic_cast<const SpecularSimulation*>(&simulation))
-        item = createSpecularInstrumentItem(*spec_simulation);
+    if (const auto* sim = dynamic_cast<const ScatteringSimulation*>(&simulation))
+        item = createGISASInstrumentItem(*sim);
+    else if (const auto* sim = dynamic_cast<const OffspecSimulation*>(&simulation))
+        item = createOffspecInstrumentItem(*sim);
+    else if (const auto* sim = dynamic_cast<const SpecularSimulation*>(&simulation))
+        item = createSpecularInstrumentItem(*sim);
     else
         ASSERT_NEVER;
 

Tests/Suite/GUI/Check.cpp

@@ -50,13 +50,14 @@ std::unique_ptr<ISimulation> indirectSimulation(const ISimulation& sim)
 bool checkSimulation(const std::string& name, ISimulation& sim, const double limit)
 {
     std::cout << "Tests/Suite/GUI: " << name << std::endl;
-    std::cout << "  Direct simulation" << std::endl;
-    const Datafield ref_data = sim.simulate();
 
     std::cout << "  Round trip (simulation -> GUI items -> simulation)" << std::endl;
     std::unique_ptr<ISimulation> sim2(indirectSimulation(sim));
     const Datafield data2 = sim2->simulate();
 
+    std::cout << "  Direct simulation" << std::endl;
+    const Datafield ref_data = sim.simulate();
+
     std::cout << "  Check difference" << std::endl;
     bool ok = DiffUtil::checkRelativeDifference(data2.flatVector(), ref_data.flatVector(), limit);