upd generation of python script

Sim/Export/SimulationToPython.cpp

@@ -79,16 +79,10 @@ std::string defineFootprint(const IFootprint& foot)
 std::string defineAlphaScan(const AlphaScan& scan)
 {
     std::ostringstream result;
-    result << "\n"
-           << indent() << "# Define specular scan:\n"
-           << indent() << "axis = " << Py::Fmt2::printAxis(scan.coordinateAxis(), "rad") << "\n"
+    result << indent() << "axis = " << Py::Fmt2::printAxis(scan.coordinateAxis(), "rad") << "\n"
            << indent() << "scan = "
            << "ba.AlphaScan(axis)\n";
 
-    if (const IFootprint* fp = scan.footprint()) {
-        result << defineFootprint(*fp);
-        result << indent() << "scan.setFootprint(footprint)\n";
-    }
     if (const IDistribution1D* d = scan.angleDistribution()) {
         result << indent() << "distribution = " << Py::Fmt2::printDistribution(*d);
         result << indent() << "scan.setAngleDistribution(distribution)\n";
@@ -252,6 +246,10 @@ std::string defineGISASBeam(const ScatteringSimulation& simulation)
         result << ", " << Py::Fmt::printDegrees(beam.phi_i());
     result << ")\n";
 
+    if (const IFootprint* fp = beam.footprint()) {
+        result << defineFootprint(*fp);
+        result << indent() << "beam.setFootprint(footprint)\n";
+    }
     result << defineBeamPolarization(beam);
 
     return result.str();
@@ -268,6 +266,10 @@ std::string defineBeamScan(const IBeamScan& scan)
         ASSERT(false);
     if (scan.intensity() != 1)
         result << indent() << "scan.setIntensity(" << scan.intensity() << ")\n";
+    if (const IFootprint* fp = scan.footprint()) {
+        result << defineFootprint(*fp);
+        result << indent() << "scan.setFootprint(footprint)\n";
+    }
     const PolFilter* analyzer = scan.analyzer();
     if (analyzer)
         result << definePolarizationAnalyzer(*analyzer, "scan");
@@ -350,6 +352,7 @@ std::string defineBackground(const ISimulation& simulation)
 std::string defineScatteringSimulation(const ScatteringSimulation& simulation)
 {
     std::ostringstream result;
+    result << "\n" << indent() << "# Define GISAS simulation:\n";
     result << defineGISASBeam(simulation);
     result << defineDetector(simulation.detector());
     result << indent() << "simulation = ba.ScatteringSimulation(beam, sample, detector)\n";
@@ -363,7 +366,7 @@ std::string defineScatteringSimulation(const ScatteringSimulation& simulation)
 std::string defineOffspecSimulation(const OffspecSimulation& simulation)
 {
     std::ostringstream result;
-
+    result << "\n" << indent() << "# Define off-specular simulation:\n";
     result << defineBeamScan(*simulation.scan());
 
     const OffspecDetector& detector = simulation.detector();
@@ -385,6 +388,7 @@ std::string defineOffspecSimulation(const OffspecSimulation& simulation)
 std::string defineSpecularSimulation(const SpecularSimulation& simulation)
 {
     std::ostringstream result;
+    result << "\n" << indent() << "# Define specular scan:\n";
     result << defineBeamScan(*simulation.scan());
     result << indent() << "simulation = ba.SpecularSimulation(scan, sample)\n";
     result << defineParameterDistributions(simulation.paramDistributions());