gammasimtools 0.25.0__py3-none-any.whl → 0.27.0__py3-none-any.whl

simtools/applications/db_get_array_layouts_from_db.py

@@ -85,7 +85,7 @@ def _parse():
     )
 
 
-def _layout_from_db(args_dict, db_config):
+def _layout_from_db(args_dict):
     """
     Read array elements and their positions from data base using the layout name.
 
@@ -93,8 +93,6 @@ def _layout_from_db(args_dict, db_config):
     ----------
     args_dict : dict
         Dictionary with the command line arguments.
-    db_config : dict
-        Database configuration.
 
     Returns
     -------
@@ -102,7 +100,6 @@ def _layout_from_db(args_dict, db_config):
         Table with array element positions.
     """
     array_model = ArrayModel(
-        db_config=db_config,
         model_version=args_dict["model_version"],
         site=args_dict["site"],
         layout_name=args_dict.get("array_layout_name", None),
@@ -121,20 +118,19 @@ def main():
         if app_context.args.get("site", None) is None:
             raise ValueError("Site must be provided to list available layouts.")
         site_model = SiteModel(
-            db_config=app_context.db_config,
             model_version=app_context.args["model_version"],
             site=app_context.args["site"],
         )
         print(site_model.get_list_of_array_layouts())
     else:
         app_context.logger.info("Array layout: %s", app_context.args["array_layout_name"])
-        layout = _layout_from_db(app_context.args, app_context.db_config)
+        layout = _layout_from_db(app_context.args)
         layout.pprint()
 
         if not app_context.args.get("output_file_from_default", False):
             writer.ModelDataWriter.dump(
-                args_dict=app_context.args,
                 output_file=app_context.args["output_file"],
+                output_file_format=app_context.args.get("output_file_format"),
                 metadata=None,
                 product_data=layout,
             )

simtools/applications/db_get_file_from_db.py

@@ -60,7 +60,7 @@ def main():
     """Get file from database."""
     app_context = startup_application(_parse)
 
-    db = db_handler.DatabaseHandler(db_config=app_context.db_config)
+    db = db_handler.DatabaseHandler()
     file_id = db.export_model_files(
         dest=app_context.io_handler.get_output_directory(),
         file_names=app_context.args["file_name"],

simtools/applications/db_get_parameter_from_db.py

@@ -108,7 +108,7 @@ def main():
     """Get a parameter entry from DB for a specific telescope or a site."""
     app_context = startup_application(_parse)
 
-    db = db_handler.DatabaseHandler(db_config=app_context.db_config)
+    db = db_handler.DatabaseHandler()
 
     pars = db.get_model_parameter(
         parameter=app_context.args["parameter"],

simtools/applications/db_inspect_databases.py

@@ -32,7 +32,7 @@ def main():
     """Inspect databases."""
     app_context = startup_application(_parse, setup_io_handler=False)
 
-    db = db_handler.DatabaseHandler(db_config=app_context.db_config)
+    db = db_handler.DatabaseHandler()
     # databases without internal databases we don't have rights to modify
     databases = [
         d

simtools/applications/db_upload_model_repository.py

@@ -87,7 +87,7 @@ def main():
     """Application main."""
     app_context = startup_application(_parse)
 
-    db = db_handler.DatabaseHandler(db_config=app_context.db_config)
+    db = db_handler.DatabaseHandler()
     db.print_connection_info()
 
     db_model_upload.add_complete_model(

simtools/applications/derive_ctao_array_layouts.py

@@ -92,7 +92,7 @@ def main():
         branch_name=app_context.args["repository_branch"],
     )
 
-    db = db_handler.DatabaseHandler(db_config=app_context.db_config)
+    db = db_handler.DatabaseHandler()
     db_array_layouts = db.get_model_parameter(
         parameter="array_layouts",
         site=app_context.args["site"],
@@ -107,7 +107,6 @@ def main():
     write_array_layouts(
         array_layouts=merge_array_layouts(db_array_layouts["array_layouts"], ctao_array_layouts),
         args_dict=app_context.args,
-        db_config=app_context.db_config,
     )
 
 

simtools/applications/{calculate_incident_angles.py → derive_incident_angle.py}

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 r"""
-Calculate photon incident angles on focal plane and primary/secondary mirrors.
+Derive photon incident angles on focal plane and primary/secondary mirrors.
 
 Creates photon files with additional columns for incident angles calculation.
 Outputs files and histograms of the incidence angles at
@@ -14,7 +14,7 @@ Example usage
 
 .. code-block:: console
 
-    simtools-calculate-incident-angles \
+    simtools-derive-incident-angle \
         --off_axis_angles 0 1 2 3 4 \
         --source_distance 10 \
         --number_of_photons 1000000 \
@@ -47,27 +47,27 @@ The application writes:
 
 Example of a focal-plane incident angle plot for a SST:
 
-.. _plot_calculate_incident_angles_plot:
-.. image:: images/incident_angles_multi_calculate_incident_angles_SSTS-04.png
+.. _plot_derive_incident_angle_plot:
+.. image:: images/incident_angles_multi_derive_incident_angle_SSTS-04.png
     :width: 49 %
 
 Example of a primary mirror incident angle plot for a SST:
 
-.. _plot_calculate_incident_angles_plot_primary:
-.. image:: images/incident_angles_primary_multi_calculate_incident_angles_SSTS-04.png
+.. _plot_derive_incident_angle_plot_primary:
+.. image:: images/incident_angles_primary_multi_derive_incident_angle_SSTS-04.png
     :width: 49 %
 
 Note also the relation between radius and primary mirror incident angles, and how this relates to
 the peak seen in the primary mirror incident angle distribution:
 
-.. _plot_calculate_incident_angles_plot_angle_vs_radius:
+.. _plot_derive_incident_angle_plot_angle_vs_radius:
 .. image:: images/primary_angle_vs_radius.png
     :width: 49 %
 
 Example of a secondary mirror incident angle plot for a SST:
 
-.. _plot_calculate_incident_angles_plot_secondary:
-.. image:: images/incident_angles_secondary_multi_calculate_incident_angles_SSTS-04.png
+.. _plot_derive_incident_angle_plot_secondary:
+.. image:: images/incident_angles_secondary_multi_derive_incident_angle_SSTS-04.png
     :width: 49 %
 """
 
@@ -82,9 +82,7 @@ def _parse():
     """Parse command line configuration."""
     config = configurator.Configurator(
         label=get_application_label(__file__),
-        description=(
-            "Calculate photon incident angles on focal plane and primary/secondary mirrors."
-        ),
+        description=("Derive photon incident angles on focal plane and primary/secondary mirrors."),
     )
     config.parser.add_argument(
         "--off_axis_angles",
@@ -123,7 +121,7 @@ def _parse():
     config.parser.add_argument(
         "--calculate_primary_secondary_angles",
         dest="calculate_primary_secondary_angles",
-        help="Also compute angles of incidence on primary and secondary mirrors",
+        help="Compute angles of incidence on primary and secondary mirrors",
         required=False,
         action="store_true",
     )
@@ -134,10 +132,10 @@ def _parse():
 
 
 def main():
-    """Calculate photon incident angles on focal plane and primary/secondary mirrors."""
+    """Derive photon incident angles on focal plane and primary/secondary mirrors."""
     app_context = startup_application(_parse)
 
-    app_context.logger.info("Starting calculation of incident angles")
+    app_context.logger.info("Starting derivation of incident angles")
 
     output_dir = app_context.io_handler.get_output_directory()
     base_label = app_context.args.get("label", get_application_label(__file__))
@@ -145,8 +143,6 @@ def main():
     label_with_telescope = f"{base_label}_{telescope_name}"
 
     calculator = IncidentAnglesCalculator(
-        simtel_path=app_context.args["simtel_path"],
-        db_config=app_context.db_config,
         config_data=app_context.args,
         output_dir=output_dir,
         label=base_label,
@@ -159,10 +155,12 @@ def main():
         output_dir,
         label_with_telescope,
         debug_plots=app_context.args.get("debug_plots", False),
+        model_version=app_context.args.get("model_version", None),
     )
+    calculator.save_model_parameters(results_by_offset)
     total = sum(len(t) for t in results_by_offset.values())
     summary_msg = (
-        f"Calculated incident angles for {len(results_by_offset)} offsets,\n"
+        f"Derived incident angles for {len(results_by_offset)} offsets,\n"
         f"total photon statistics {total}"
     )
     if total < 1_000_000:

simtools/applications/derive_mirror_rnda.py

@@ -1,229 +1,161 @@
 #!/usr/bin/python3
 
-r"""
-    Derive mirror random reflection angle (mirror roughness) of a single mirror panel.
-
-    Description
-    -----------
-
-    This application derives the value of the simulation model parameter
-    *mirror_reflection_random_angle* using measurements of the focal length
-    and point-spread function (PSF) of individual mirror panels.
-    This parameter is sometimes referred to as the "mirror roughness".
-
-    PSF measurements are provided by one of the following options:
-
-        * mean and sigma value obtained from the measurement of containment diameters of a number of
-          mirror panels in cm (``--psf_measurement_containment_mean`` and
-          ``--psf_measurement_containment_sigma``)
-        * file (table) with measured PSF for each mirror panel spot size (``--psf_measurement``)
-
-    The containment fraction used for the PSF diameter calculation is set through
-    the argument ``--containment_fraction`` (typically 0.8 = 80%; called below D80).
-
-    Mirror panels are simulated individually, using one of the following options to set the
-    mirror panel focal length:
-
-        * file (table) with measured focal lengths per mirror panel
-          (provided through ``--mirror_list``)
-        * randomly generated focal lengths using an expected spread (value given through
-          ``--random_focal_length``) around the mean focal length (provided through the
-          Model Parameters DB). This option is switched with ``--use_random_focal_length``.
-
-    The tuning algorithm requires a starting value for the random reflection angle. This is either
-    taken from the Model Parameters DB (default) or can be set using the argument ``--rnda``.
-
-    Ray-tracing simulations are performed for single mirror configurations for each
-    mirror given in the mirror list. The mean simulated containment diameter for all the mirrors
-    is compared with the mean measured containment diameter. The algorithm defines a new value for
-    the random reflection angle based on the sign of the difference between measured and simulated
-    containment diameters and a new set of simulations is performed. This process is repeated
-    until the sign of the difference changes, meaning that the two final values of the random
-    reflection angle brackets the optimal. These two values are used to find the optimal one by
-    a linear interpolation. Finally, simulations are performed by using the interpolated value,
-    which is defined as the desired optimal.
-
-    The option ``--no_tuning`` can be used if one only wants to simulate one value for the random
-    reflection angle and compare the results with the measured ones.
-
-    Results of the tuning are plotted. See examples of the PSF containment diameter
-    D80 vs random reflection angle plot, on the left, and the D80 distributions
-    (per mirror panel), on the right.
-
-    .. _derive_rnda_plot:
-    .. image:: images/derive_mirror_rnda_North-MST-FlashCam-D.png
-      :width: 49 %
-    .. image:: images/derive_mirror_rnda_North-MST-FlashCam-D_D80-distributions.png
-      :width: 49 %
-
-    This application uses the following software tools:
-
-        - sim_telarray/bin/sim_telarray
-        - sim_telarray/bin/rx (optional)
-
-    Command line arguments
-    ----------------------
-    telescope (str, required)
-        Telescope name (e.g. LSTN-01, SSTS-25)
-    model_version (str, optional)
-        Model version
-    psf_measurement (str, optional)
-        Table with results from PSF measurements for each mirror panel spot size
-    psf_measurement_containment_mean (float, required)
-        Mean of measured containment diameter [cm]
-    psf_measurement_containment_sigma (float, optional)
-        Std dev of measured containment diameter [cm]
-    containment_fraction (float, required)
-        Containment fraction for diameter calculation
-    rnda (float, optional)
-        Starting value of mirror_reflection_random_angle [deg]. If not given, the value from the
-        default model is read from the simulation model database.
-    mirror_list (file, optional)
-        Table with mirror ID and panel radius.
-    use_random_focal_length (activation mode, optional)
-        Use random focal lengths, instead of the measured ones. The argument random_focal_length
-        can be used to replace the default random_focal_length from the model.
-    random_focal_length (float, optional)
-        Value of the random focal lengths to replace the default random_focal_length. Only used if
-        'use_random_focal_length' is activated.
-    random_focal_length_seed (int, optional)
-        Seed for the random number generator used for focal length variation.
-    no_tuning (activation mode, optional)
-        Turn off the tuning - A single case will be simulated and plotted.
-    test (activation mode, optional)
-        If activated, application will be faster by simulating only few mirrors.
-
-    Example
-    -------
-    Derive mirror random reflection angle for a large-sized telescope (LSTS),
-    simulation production 6.0.0
-
-    .. code-block:: console
-
-        simtools-derive-mirror-rnda \\
-            --site South \\
-            --telescope LSTS-design \\
-            --model_version 6.0.0 \\
-            --containment_fraction 0.8 \\
-            --mirror_list ./tests/resources/mirror_list_CTA-N-LST1_v2019-03-31_rotated.ecsv
-            --rnda 0.003 \\
-            --psf_measurement_containment_mean 1.4 \\
-
-    Expected final print-out message:
-
-    .. code-block:: console
-
-        Measured D80:
-        Mean = 1.400 cm
-
-        Simulated D80:
-        Mean = 1.406 cm, StdDev = 0.005 cm
-
-        mirror_random_reflection_angle
-        Previous value = 0.003000
-        New value = 0.003824
+r"""Derive mirror random reflection angle based on per-mirror PSF diameter optimization.
+
+Description
+-----------
+
+This application derives the value of the simulation model parameter
+*mirror_reflection_random_angle* using measurements of a PSF containment diameter
+and focal length of individual mirror panels.
+
+The optimization uses percentage difference as the metric::
+
+    pct_diff = 100 * (simulated_psf - measured_psf) / measured_psf
+
+Each mirror is optimized individually, and the final RNDA is the average of all
+per-mirror optimized values.
+
+Command line arguments
+----------------------
+
+site (str, required)
+    North or South.
+telescope (str, required)
+    Telescope name (e.g. LSTN-01, SSTS-25).
+model_version (str, optional)
+    Model version.
+data (str, required)
+    ECSV file with PSF diameter (mm) per mirror.
+    Accepted column names: psf_opt, psf, or d80.
+fraction (float, optional)
+    PSF containment fraction for diameter calculation (e.g. 0.8 for D80, 0.95 for D95).
+    Default: 0.8.
+threshold (float, optional)
+    Convergence threshold for percentage difference (e.g. 0.05 for 5%).
+    Default: 0.05.
+learning_rate (float, optional)
+    Learning rate for gradient descent. Default: 0.001.
+test (optional)
+    Only optimize a small number of mirrors.
+n_workers (int, optional)
+    Number of parallel worker processes to use. Default: 0 (auto chooses maximum).
+number_of_mirrors_to_test (int, optional)
+    Number of mirrors to optimize when --test is used. Default: 10.
+psf_hist (str, optional)
+    If activated, write a histogram comparing measured vs simulated PSF diameter distributions.
+cleanup (optional)
+    Remove intermediate files (patterns: ``*.log``, ``*.lis*``, ``*.dat``)
+    from output.
+
+Example
+-------
+
+.. code-block:: console
+
+    simtools-derive-mirror-rnda \
+        --site North \
+        --telescope LSTN-01 \
+        --model_version 7.0.0 \
+        --data tests/resources/MLTdata-preproduction.ecsv \
+        --parameter_version 1.0.0 \
+        --test --psf_hist --cleanup
 
 """
 
+from pathlib import Path
+
 from simtools.application_control import get_application_label, startup_application
 from simtools.configuration import configurator
 from simtools.ray_tracing.mirror_panel_psf import MirrorPanelPSF
+from simtools.ray_tracing.psf_parameter_optimisation import cleanup_intermediate_files
 
 
 def _parse():
     """Parse command line configuration."""
     config = configurator.Configurator(
-        description="Derive mirror random reflection angle.", label=get_application_label(__file__)
+        description="Derive mirror RNDA using per-mirror PSF diameter optimization.",
+        label=get_application_label(__file__),
     )
-    psf_group = config.parser.add_mutually_exclusive_group()
-    psf_group.add_argument(
-        "--psf_measurement_containment_mean",
-        help="Mean of measured PSF containment diameter [cm]",
-        type=float,
-        required=False,
-    )
-    psf_group.add_argument(
-        "--psf_measurement",
-        help="Results from PSF measurements for each mirror panel spot size",
+    config.parser.add_argument(
+        "--data",
+        help="ECSV file with a PSF diameter column (mm) per mirror",
         type=str,
-        required=False,
+        required=True,
     )
     config.parser.add_argument(
-        "--psf_measurement_containment_sigma",
-        help="Std dev of measured PSF containment diameter [cm]",
+        "--threshold",
+        help="Convergence threshold for percentage difference.",
         type=float,
         required=False,
+        default=0.05,
     )
     config.parser.add_argument(
-        "--containment_fraction",
-        help="Containment fraction for diameter calculation (in interval 0,1)",
-        type=config.parser.efficiency_interval,
-        required=False,
-        default=0.8,
-    )
-    config.parser.add_argument(
-        "--rnda",
-        help="Starting value of mirror_reflection_random_angle",
+        "--learning_rate",
+        help="Learning rate for gradient descent.",
         type=float,
         required=False,
-        default=0.0,
-    )
-    config.parser.add_argument(
-        "--mirror_list",
-        help=("Mirror list file to replace the default one."),
-        type=str,
-        required=False,
+        default=0.001,
     )
     config.parser.add_argument(
-        "--rtol_psf_containment",
-        help="Relative tolerance for the containment diameter (default is 0.1).",
+        "--fraction",
+        help=(
+            "PSF containment fraction for diameter calculation (e.g., 0.8 for D80, 0.95 for D95)."
+        ),
         type=float,
-        required=False,
-        default=0.1,
+        default=0.8,
     )
     config.parser.add_argument(
-        "--use_random_focal_length",
-        help=("Use random focal lengths."),
-        action="store_true",
+        "--n_workers",
+        help="Number of parallel worker processes to use.",
+        type=int,
         required=False,
+        default=0,
     )
     config.parser.add_argument(
-        "--random_focal_length",
-        help=(
-            "Value of the random focal length. Only used if 'use_random_focal_length' is activated."
-        ),
-        default=None,
-        type=float,
+        "--number_of_mirrors_to_test",
+        help="Number of mirrors to optimize when --test is used.",
+        type=int,
         required=False,
+        default=10,
     )
     config.parser.add_argument(
-        "--random_focal_length_seed",
-        help="Seed for the random number generator used for focal length variation.",
-        type=int,
-        required=False,
+        "--psf_hist",
+        nargs="?",
+        const="psf_distributions.png",
         default=None,
+        help=(
+            "Write a histogram comparing measured vs simulated PSF diameter distributions. "
+            "Optionally provide a filename (relative to output dir unless absolute)."
+        ),
     )
     config.parser.add_argument(
-        "--no_tuning",
-        help="no tuning of random_reflection_angle (a single case will be simulated).",
+        "--cleanup",
         action="store_true",
-        required=False,
+        default=False,
+        help=(
+            "Remove intermediate files from the output directory (patterns: *.log, *.lis*, *.dat)."
+        ),
     )
     return config.initialize(
-        db_config=True, output=True, simulation_model=["telescope", "model_version"]
+        db_config=True,
+        output=True,
+        simulation_model=["telescope", "model_version", "site", "parameter_version"],
     )
 
 
 def main():
-    """Derive mirror random reflection angle of a single mirror panel."""
+    """Derive mirror random reflection angle using per-mirror PSF diameter optimization."""
     app_context = startup_application(_parse)
-
-    panel_psf = MirrorPanelPSF(
-        app_context.args.get("label"), app_context.args, app_context.db_config
-    )
-    panel_psf.derive_random_reflection_angle(save_figures=True)
-    panel_psf.print_results()
+    panel_psf = MirrorPanelPSF(app_context.args.get("label"), app_context.args)
+    panel_psf.optimize_with_gradient_descent()
     panel_psf.write_optimization_data()
+    if app_context.args.get("psf_hist"):
+        panel_psf.write_psf_histogram()
+
+    if app_context.args.get("cleanup"):
+        output_dir = Path(app_context.args.get("output_path", "."))
+        cleanup_intermediate_files(output_dir)
 
 
 if __name__ == "__main__":

simtools/applications/derive_psf_parameters.py

@@ -204,7 +204,6 @@ def main():
 
     tel_model, site_model, _ = initialize_simulation_models(
         label=app_context.args.get("label"),
-        db_config=app_context.db_config,
         site=app_context.args["site"],
         telescope_name=app_context.args["telescope"],
         model_version=app_context.args["model_version"],

simtools/applications/derive_pulse_shape_parameters.py

@@ -135,7 +135,6 @@ def main():
     label = app_context.args.get("label") or get_application_label(__file__)
     telescope_model, _, _ = initialize_simulation_models(
         label=label,
-        db_config=app_context.db_config,
         model_version=app_context.args["model_version"],
         site=site,
         telescope_name=app_context.args["telescope"],

simtools/applications/derive_trigger_rates.py

@@ -81,7 +81,7 @@ def main():
     """Derive trigger rates for a single telescope or an array of telescopes."""
     app_context = startup_application(_parse)
 
-    telescope_trigger_rates(app_context.args, app_context.db_config)
+    telescope_trigger_rates(app_context.args)
 
 
 if __name__ == "__main__":

simtools/applications/docs_produce_array_element_report.py

@@ -61,18 +61,12 @@ def main():
             app_context.args.get("all_model_versions"),
         ]
     ):
-        ReportGenerator(
-            app_context.db_config,
-            app_context.args,
-            output_path,
-        ).auto_generate_array_element_reports()
+        ReportGenerator(app_context.args, output_path).auto_generate_array_element_reports()
 
     else:
         model_version = app_context.args["model_version"]
         ReadParameters(
-            app_context.db_config,
-            app_context.args,
-            Path(output_path / f"{model_version}"),
+            app_context.args, Path(output_path / f"{model_version}")
         ).produce_array_element_report()
 
         app_context.logger.info(

simtools/applications/docs_produce_calibration_reports.py

@@ -32,9 +32,7 @@ def main():
 
     output_path = app_context.io_handler.get_output_directory()
 
-    generator = ReportGenerator(
-        db_config=app_context.db_config, args=app_context.args, output_path=output_path
-    )
+    generator = ReportGenerator(args=app_context.args, output_path=output_path)
     generator.auto_generate_calibration_reports()
 
     if app_context.args.get("all_model_versions"):

simtools/applications/docs_produce_model_parameter_reports.py

@@ -41,14 +41,12 @@ def main():
 
     if any([app_context.args.get("all_telescopes"), app_context.args.get("all_sites")]):
         ReportGenerator(
-            app_context.db_config,
             app_context.args,
             output_path,
         ).auto_generate_parameter_reports()
 
     else:
         ReadParameters(
-            app_context.db_config,
             app_context.args,
             output_path,
         ).produce_model_parameter_reports()

simtools/applications/docs_produce_simulation_configuration_report.py

@@ -33,9 +33,7 @@ def main():
 
     output_path = app_context.io_handler.get_output_directory()
 
-    report_generator = ReportGenerator(
-        db_config=app_context.db_config, args=app_context.args, output_path=output_path
-    )
+    report_generator = ReportGenerator(args=app_context.args, output_path=output_path)
     report_generator.auto_generate_simulation_configuration_reports()
 
     app_context.logger.info(

simtools/applications/generate_array_config.py

@@ -46,7 +46,6 @@ def main():
     array_model = ArrayModel(
         label=app_context.args["label"],
         model_version=app_context.args["model_version"],
-        db_config=app_context.db_config,
         site=app_context.args.get("site"),
         layout_name=app_context.args.get("array_layout_name"),
         array_elements=app_context.args.get("array_elements"),