RTModel 2.0__tar.gz → 2.1.0__tar.gz

rtmodel-2.1.0/.github/workflows/run_tests.yml

@@ -0,0 +1,41 @@
+name: run_tests
+
+on: [push, pull_request]
+
+jobs:
+  run_tests:
+    name: run_tests_on_${{ matrix.os }}_python_${{ matrix.python_version }}_pip_install_flag_${{ matrix.pip_install_flag }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python_version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        pip_install_flag: ["none", "editable", "user"]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: setup_python_${{ matrix.python_version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      - name: install
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          if [ "${{ matrix.pip_install_flag }}" = "editable" ]; then
+            pip_install_flag="--editable"
+          elif [ "${{ matrix.pip_install_flag }}" = "user" ]; then
+            pip_install_flag="--user"
+          else
+            pip_install_flag=""
+          fi
+          pip install -v ${pip_install_flag} .
+
+      - name: test
+        run: |
+          pip install pytest
+          cd ..
+          python -m pytest RTModel/tests

rtmodel-2.1.0/.gitignore

@@ -0,0 +1,42 @@
+### C++ template
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen

rtmodel-2.1.0/CMakeLists.txt

@@ -0,0 +1,49 @@
+cmake_minimum_required(VERSION 3.19)
+
+project(RTModel LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set(MINIMUM_GCC_VERSION "9.0")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS MINIMUM_GCC_VERSION)
+        message(FATAL_ERROR "GCC must be ${MINIMUM_GCC_VERSION} or greater.")
+    endif()
+endif()
+
+# Build executables
+# =================
+
+add_executable(Reader RTModel/lib/Reader.cpp)
+target_include_directories(Reader PRIVATE RTModel/include)
+
+add_executable(InitCond RTModel/lib/InitCond.cpp)
+target_include_directories(InitCond PRIVATE RTModel/include)
+
+add_executable(LevMar RTModel/lib/bumper.cpp RTModel/lib/LevMar.cpp RTModel/lib/LevMarFit.cpp
+        RTModel/lib/VBBinaryLensingLibrary.cpp)
+target_include_directories(LevMar PRIVATE RTModel/include)
+
+add_executable(ModelSelector RTModel/lib/bumper.cpp RTModel/lib/ModelSelector.cpp)
+target_include_directories(ModelSelector PRIVATE RTModel/include)
+
+add_executable(Finalizer RTModel/lib/bumper.cpp RTModel/lib/Finalizer.cpp)
+target_include_directories(Finalizer PRIVATE RTModel/include)
+
+# Install executables
+# ===================
+
+if(SKBUILD)  # Only run if called through scikit-build-core. That is, don't run when called through CMake directly.
+    set(binary_directory "${SKBUILD_PLATLIB_DIR}/RTModel/bin")
+
+    install(TARGETS Reader DESTINATION ${binary_directory})
+    install(TARGETS InitCond DESTINATION ${binary_directory})
+    install(TARGETS LevMar DESTINATION ${binary_directory})
+    install(TARGETS ModelSelector DESTINATION ${binary_directory})
+    install(TARGETS Finalizer DESTINATION ${binary_directory})
+
+    # Ensure data files are present in platlib.
+    add_custom_command(TARGET Reader POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${CMAKE_CURRENT_LIST_DIR}/RTModel/data" "${SKBUILD_PLATLIB_DIR}/RTModel/data")
+endif()

{RTModel-2.0 → rtmodel-2.1.0}/LICENSE

@@ -1,7 +1,8 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
+                 GNU LESSER GENERAL PUBLIC LICENSE
+
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

{RTModel-2.0 → rtmodel-2.1.0}/MANIFEST.in

@@ -1,6 +1,5 @@
-include RTModel/bin/Reader.exe
 graft RTModel/data
 graft RTModel/lib
 graft RTModel/include
 graft RTModel/bin
-global-exclude RTModel/lib/*.o*
+global-exclude RTModel/lib/*.o*

{RTModel-2.0/RTModel.egg-info → rtmodel-2.1.0}/PKG-INFO

@@ -1,61 +1,76 @@
-Metadata-Version: 2.1
-Name: RTModel
-Version: 2.0
-Summary: RTModel is a tool for microlensing event interpretation.
-Author-email: Valerio Bozza <valboz@sa.infn.it>
-License: GPL-3.0
-Project-URL: Homepage, https://github.com/valboz/RTModel
-Keywords: Microlensing analysis and fitting
-Classifier: Development Status :: 1 - Planning
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 3
-Requires-Python: <4,>=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: numpy
-Requires-Dist: pytest
-Requires-Dist: matplotlib
-Requires-Dist: tqdm
-Requires-Dist: VBBinaryLensing>=3.7.0
-
-# RTModel
-`RTModel` is a package for modeling and interpretation of microlensing events. It uses photometric time series collected from ground and/or space telescopes to propose one or more possible models among the following:
-- Single-lens-single-source microlensing (i.e. Paczynski)
-- Single-lens-binary-source microlensing (with or without xallarap)
-- Binary-lens-single-source microlensing (including planetary microlensing, parallax and orbital motion)
-
-All models include the finite-size of the source(s).
-
-The modeling strategy is based on a grid search in the parameter space for single-lens models, whereas a **template library** for binary-lens models is used including all possible geometries of the source trajectory with respect to the caustics. In addition to this global search, planets are searched where maximal deviations from a Paczynski model occurs. 
-
-The library is in the form of a standard Python package that launches specific subprocesses for different tasks. Model fitting is executed in **parallel** exploiting available processors in the machine. The full modeling may take from one to three hours depending on the event and on the machine speed. The results of modeling are given in the form of a text **assessment file**; in addition, **final models** are made available with their parameters and covariance matrices.
-
-`RTModel` also includes a subpackage **`RTModel.plotmodel`** that allows an immediate visualization of models and the possibility to review each individual fitting process as an animated gif.
-
-## Attribution
-
-A paper is in preparation describing all algorithms behind RTModel in detail.
-At the moment, any use of this code for scientific publications should be acknowledged by citing this GitHub repository. 
-
-## Installation
-
-The easiest way to install `RTModel` is through `pip`
-```
-pip install RTModel
-```
-
-Currently, `RTModel` works on Linux and Windows, requiring Python >= 3.6. 
-A C++ compiler compatible with C++17 standard is needed for installation.
-`RTModel` also incorporates version 3.7 of [`VBBinaryLensing`](https://github.com/valboz/VBBinaryLensing).
-
-Example Jupyter notebooks will be included in `examples/`.
-
-## Documentation
-Provisional [documentation for the use of RTModel](docs/README.md) is available and under development.
-
-## License
-`RTModel` is freely available to the community under the 
-GNU Lesser General Public License Version 3 included in this repository.
-
-
+Metadata-Version: 2.1
+Name: RTModel
+Version: 2.1.0
+Summary: RTModel is a tool for microlensing event interpretation.
+Keywords: Microlensing analysis and fitting
+Author-Email: Valerio Bozza <valboz@sa.infn.it>
+License: GPL-3.0
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: Programming Language :: Python :: 3
+Project-URL: Homepage, https://github.com/valboz/RTModel
+Requires-Python: <4,>=3.6
+Requires-Dist: numpy
+Requires-Dist: pytest
+Requires-Dist: matplotlib
+Requires-Dist: tqdm
+Requires-Dist: VBBinaryLensing>=3.7.0
+Description-Content-Type: text/markdown
+
+# RTModel
+`RTModel` is a package for modeling and interpretation of microlensing events. It uses photometric time series collected from ground and/or space telescopes to propose one or more possible models among the following:
+- Single-lens-single-source microlensing (i.e. Paczynski)
+- Single-lens-binary-source microlensing (with or without xallarap)
+- Binary-lens-single-source microlensing (including planetary microlensing, parallax and orbital motion)
+
+All models include the finite-size of the source(s).
+
+The modeling strategy is based on a grid search in the parameter space for single-lens models, whereas a **template library** for binary-lens models is used including all possible geometries of the source trajectory with respect to the caustics. In addition to this global search, planets are searched where maximal deviations from a Paczynski model occurs. 
+
+The library is in the form of a standard Python package that launches specific subprocesses for different tasks. Model fitting is executed in **parallel** exploiting available processors in the machine. The full modeling may take from one to three hours depending on the event and on the machine speed. The results of modeling are given in the form of a text **assessment file**; in addition, **final models** are made available with their parameters and covariance matrices.
+
+`RTModel` also includes a subpackage **`RTModel.plotmodel`** that allows an immediate visualization of models and the possibility to review each individual fitting process as an animated gif.
+
+## Attribution
+
+`RTModel` has been created by Valerio Bozza (University of Salerno) as a product of many years of direct experience on microlensing modeling (see [RTModel webpage](http://www.fisica.unisa.it/GravitationAstrophysics/RTModel.htm)). 
+
+Any scientific use of `RTModel` should be acknowledged by citing the paper [V.Bozza, A&A 688 (2024) 83](https://ui.adsabs.harvard.edu/abs/2024A%26A...688A..83B/abstract), describing all the algorithms behind the code.
+
+We are grateful to Greg Olmschenk, who revised the package installation in order to make it as cross-platform as possible.
+
+## Installation
+
+The easiest way to install `RTModel` is through `pip`. 
+
+First clone this repository.
+
+Then go to the repository directory and type
+
+```
+pip install .
+```
+
+In alternative, you may directly install it from PyPI without cloning this repository:
+
+```
+pip install RTModel
+```
+
+Currently, `RTModel` works on Linux, Windows and MacOS, requiring Python >= 3.6. 
+A C++ compiler compatible with C++17 standard is needed for installation.
+`RTModel` also incorporates version 3.7 of [`VBBinaryLensing`](https://github.com/valboz/VBBinaryLensing).
+
+## Documentation
+Full [documentation for the use of RTModel](docs/README.md) is available.
+
+In the directory [events](events) we provide some microlensing data on which you may practise with `RTModel`.
+
+A Jupyter notebook for quick start-up is also available in the [jupyter](jupyter) folder.
+
+## License
+`RTModel` is freely available to the community under the 
+GNU Lesser General Public License Version 3 included in this repository.
+
+

{RTModel-2.0 → rtmodel-2.1.0}/README.md

@@ -14,24 +14,40 @@ The library is in the form of a standard Python package that launches specific s
 
 ## Attribution
 
-A paper is in preparation describing all algorithms behind RTModel in detail.
-At the moment, any use of this code for scientific publications should be acknowledged by citing this GitHub repository. 
+`RTModel` has been created by Valerio Bozza (University of Salerno) as a product of many years of direct experience on microlensing modeling (see [RTModel webpage](http://www.fisica.unisa.it/GravitationAstrophysics/RTModel.htm)). 
+
+Any scientific use of `RTModel` should be acknowledged by citing the paper [V.Bozza, A&A 688 (2024) 83](https://ui.adsabs.harvard.edu/abs/2024A%26A...688A..83B/abstract), describing all the algorithms behind the code.
+
+We are grateful to Greg Olmschenk, who revised the package installation in order to make it as cross-platform as possible.
 
 ## Installation
 
-The easiest way to install `RTModel` is through `pip`
+The easiest way to install `RTModel` is through `pip`. 
+
+First clone this repository.
+
+Then go to the repository directory and type
+
+```
+pip install .
+```
+
+In alternative, you may directly install it from PyPI without cloning this repository:
+
 ```
 pip install RTModel
 ```
 
-Currently, `RTModel` works on Linux and Windows, requiring Python >= 3.6. 
+Currently, `RTModel` works on Linux, Windows and MacOS, requiring Python >= 3.6. 
 A C++ compiler compatible with C++17 standard is needed for installation.
 `RTModel` also incorporates version 3.7 of [`VBBinaryLensing`](https://github.com/valboz/VBBinaryLensing).
 
-Example Jupyter notebooks will be included in `examples/`.
-
 ## Documentation
-Provisional [documentation for the use of RTModel](docs/README.md) is available and under development.
+Full [documentation for the use of RTModel](docs/README.md) is available.
+
+In the directory [events](events) we provide some microlensing data on which you may practise with `RTModel`.
+
+A Jupyter notebook for quick start-up is also available in the [jupyter](jupyter) folder.
 
 ## License
 `RTModel` is freely available to the community under the 

{RTModel-2.0 → rtmodel-2.1.0}/RTModel/RTModel.py

@@ -1,10 +1,10 @@
-
+import site
 import subprocess
 import os
 import sys
 import glob
 import time
-import inspect
+from pathlib import Path
 from tqdm import tqdm
 import shutil
 
@@ -15,9 +15,8 @@ class RTModel:
         print('*********************')
         print('****   RTModel   ****')
         print('*********************')
-        self.pathtoRTM = inspect.getfile(RTModel)
-        self.bindir = os.path.dirname(self.pathtoRTM) + '/bin/'
-        if os.name =='nt':
+        self.bindir = self.find_bin_directory()
+        if(os.path.exists(self.bindir + 'Reader.exe')):
             self.readerexe = 'Reader.exe'
             self.initcondexe = 'InitCond.exe'
             self.levmarexe = 'LevMar.exe'
@@ -80,16 +79,20 @@ class RTModel:
         else:
             print('  OK')
 
-    def config_InitCond(self, npeaks = 2, peakthreshold = 10.0, oldmodels = 4, override = None, nostatic = False, onlyorbital = False, usesatellite = 0):
+    def config_InitCond(self, npeaks = 2, peakthreshold = 10.0, oldmodels = 4, override = None, nostatic = False, onlyorbital = False, usesatellite = 0
+                       , template_library = None):
         self.InitCond_npeaks = npeaks # Number of peaks in the observed light curve to be considered for setting initial conditions.
         self.InitCond_peakthreshold = peakthreshold # Number of sigmas necessary for a deviation to be identified as a maximum or a minimum.
         self.InitCond_oldmodels = oldmodels # Maximum number of old models to include in new run as initial conditions
         self.InitCond_override = override # Override peak identification and manually set peak times
         self.InitCond_nostatic = nostatic or onlyorbital # No static models will be calculated.
-        self.InitCond_noparallax = onlyorbital; # Only orbital motion models will be calculated.
+        self.InitCond_onlyorbital = onlyorbital; # Only orbital motion models will be calculated.
         self.InitCond_usesatellite = usesatellite; # Satellite to be used for initial conditions. Ground telescopes by default.
+        self.InitCond_template_library = template_library; # Template library to be used in place of the default one.
         
     def InitCond(self):
+        ''' Establishes initial conditions for fitting by executing the InitCond external module.
+            Options can be assigned through the config_InitCond() method. '''
         if(not os.path.exists(self.eventname + '/' + self.inidir)):
             os.makedirs(self.eventname + '/' + self.inidir)
         with open(self.eventname + '/' + self.inidir + '/InitCond.ini','w') as f:
@@ -99,10 +102,12 @@ class RTModel:
             f.write('usesatellite = ' + str(self.InitCond_usesatellite) + '\n')
             if(self.InitCond_nostatic):            
                 f.write('nostatic = 1\n')
-            if(self.InitCond_noparallax):            
-                f.write('noparallax = 1\n')
+            if(self.InitCond_onlyorbital):            
+                f.write('onlyorbital = 1\n')
             if(self.InitCond_override != None):
                 f.write('override = ' + str(self.InitCond_override[0])+ ' ' + str(self.InitCond_override[1]) + '\n')            
+            if(self.InitCond_template_library != None):
+                f.write('templatelibrary = ' + self.InitCond_template_library + '\n')            
         print('- Launching: InitCond')
         print('  Setting initial conditions...')
         completedprocess = subprocess.run([self.bindir+self.initcondexe,self.eventname], cwd = self.bindir, shell = False, stdout=subprocess.DEVNULL)
@@ -110,7 +115,17 @@ class RTModel:
             print('! Error in setting initial conditions!')
             self.done = True
         else:
-            print('  OK')
+            initfils=glob.glob(self.eventname + '/InitCond/*LS*')
+            if(len(initfils)==0):
+                initfils=glob.glob(self.eventname + '/InitCond/*LX*')
+                if(len(initfils)==0):
+                    initfils=glob.glob(self.eventname + '/InitCond/*LO*')
+            with open(initfils[0], 'r') as f:
+                npeaks = int(f.readline().split()[0])
+                print('Peaks:  ',end ='')
+                for i in range(0,npeaks):
+                    print(f'{float(f.readline().split()[0]):.4f}',end = '  ')
+            print('\n  OK')
 
     def config_LevMar(self, nfits = 5, timelimit = 600.0, maxsteps = 50, bumperpower = 2.0):
         self.LevMar_nfits = nfits # Number of models to be calculated from the same initial condition using the bumper method
@@ -118,14 +133,23 @@ class RTModel:
         self.LevMar_timelimit = timelimit # Maximum time in seconds for total execution
         self.LevMar_bumperpower = bumperpower # Repulsion factor of bumpers
     
-    def LevMar(self,strmodel):
+    def LevMar(self,strmodel, parameters_file = None, parameters = None):
         if(not os.path.exists(self.eventname + '/' + self.inidir)):
             os.makedirs(self.eventname + '/' + self.inidir)
+        if(parameters != None):
+            parameters_file = self.eventname + '/' + self.inidir + '/parameters.ini'
+            with open(parameters_file,'w') as f:
+                line =''
+                for fl in parameters:
+                    line = line + str(fl) + ' '
+                f.write(line)
         with open(self.eventname + '/' + self.inidir + '/LevMar.ini','w') as f:
             f.write('nfits = ' + str(self.LevMar_nfits) + '\n')
             f.write('maxsteps = ' + str(self.LevMar_maxsteps) + '\n')
             f.write('timelimit = ' + str(self.LevMar_timelimit) + '\n')
             f.write('bumperpower = ' + str(self.LevMar_bumperpower) + '\n')
+            if(parameters_file != None):
+                f.write('parametersfile = ' + parameters_file)
         print('- Launching: LevMar')
         print('  Fitting ' + strmodel + ' ...')
         completedprocess = subprocess.run([self.bindir+self.levmarexe,self.eventname, strmodel,self.satellitedir], cwd = self.bindir, shell = False, stdout=subprocess.DEVNULL)
@@ -159,6 +183,7 @@ class RTModel:
                 ninitconds = int(line[1])   
             processes = []
             procnumbers = []
+            procepochs = []
             iinitcond = 0
             finitcond = 0
             finitcondold = -1       
@@ -166,9 +191,16 @@ class RTModel:
             while(finitcond < ninitconds):
                 i=0
                 while i < len(processes):
+                    if(time.time() - procepochs[i] > self.LevMar_timelimit):
+                        processes[i].kill()
+                        premodfiles = glob.glob(self.eventname +'/PreModels/*.txt')
+                        strmodel =  modelcode + '{:0>4}'.format(str(procnumbers[i]))
+                        with open(self.eventname +'/PreModels/' + strmodel + '/t' + strmodel + '.dat','w') as f:
+                            f.write(f'{len(premodfiles)} {self.LevMar_nfits}')
                     if(processes[i].poll() != None):
                         processes.pop(i)
                         procnumbers.pop(i)
+                        procepochs.pop(i)
                         finitcond += 1
                     else:
                         i += 1
@@ -177,6 +209,7 @@ class RTModel:
                     if(glob.glob(self.eventname +'/PreModels/' + strmodel + '/t' + strmodel + '.dat')==[]):
                         processes.append(subprocess.Popen([self.bindir+self.levmarexe,self.eventname, strmodel,self.satellitedir], cwd = self.bindir, shell = False, stdout=subprocess.DEVNULL))
                         procnumbers.append(iinitcond)
+                        procepochs.append(time.time())
                     else:
                         finitcond += 1
                     iinitcond += 1
@@ -291,3 +324,101 @@ class RTModel:
             for nam in filelist:
                 shutil.move(nam,rundir)
         os.chdir(olddir)
+
+    def recover_options(self,run = None):
+        if(self.eventname == None):
+            print('! No event chosen')
+        if(run!=None):
+            pathname = run
+        else:
+            pathname = self.eventname
+        if(not(os.path.exists(pathname))):
+            print("Invalid path!")
+            return
+        if(os.path.exists(pathname + '/' + self.inidir + '/Reader.ini')):
+            with open(pathname + '/' + self.inidir + '/Reader.ini','r') as f:
+                lines = f.read().splitlines()
+                print('Reader --- ',lines) 
+                for line in lines:
+                    chunks = line.split()
+                    if(chunks[0]=='tau'):
+                        self.Reader_tau = float(chunks[2])
+                    elif(chunks[0]=='binning'):
+                        self.Reader_binning = int(chunks[2])
+                    elif(chunks[0]=='otherseasons'):
+                        self.Reader_otherseasons = int(chunks[2])
+                    elif(chunks[0]=='renormalize'):
+                        self.Reader_renormalize = int(chunks[2])
+                    elif(chunks[0]=='thresholdoutliers'):
+                        self.Reader_thresholdoutliers = float(chunks[2])
+        if(os.path.exists(pathname + '/' + self.inidir + '/InitCond.ini')):
+            with open(pathname + '/' + self.inidir + '/InitCond.ini','r') as f:
+                lines = f.read().splitlines()
+                print('InitCond --- ',lines) 
+                self.InitCond_nostatic = False
+                self.InitCond_onlyorbital = False
+                self.InitCond_override = None
+                for line in lines:
+                    chunks = line.split()
+                    if(chunks[0]=='npeaks'):
+                        self.InitCond_npeaks = int(chunks[2])
+                    elif(chunks[0]=='peakthreshold'):
+                        self.InitCond_peakthreshold = float(chunks[2])
+                    elif(chunks[0]=='oldmodels'):
+                        self.InitCond_oldmodels = int(chunks[2])
+                    elif(chunks[0]=='usesatellite'):
+                        self.InitCond_usesatellite = int(chunks[2])
+                    elif(chunks[0]=='nostatic'):
+                        self.InitCond_nostatic = (int(chunks[2])!=0)
+                    elif(chunks[0]=='onlyorbital'):
+                        self.InitCond_onlyorbital = (int(chunks[2])!=0)
+                    elif(chunks[0]=='override'):
+                        self.InitCond_override = (float(chunks[2]),float(chunks[3]))
+                    elif(chunks[0]=='templatelibrary'):
+                        self.InitCond_template_library = chunks[2]
+        if(os.path.exists(pathname + '/' + self.inidir + '/LevMar.ini')):        
+            with open(pathname + '/' + self.inidir + '/LevMar.ini','r') as f:
+                lines = f.read().splitlines()
+                print('LevMar --- ',lines) 
+                for line in lines:
+                    chunks = line.split()
+                    if(chunks[0]=='nfits'):
+                        self.LevMar_nfits = int(chunks[2])
+                    elif(chunks[0]=='maxsteps'):
+                        self.LevMar_maxsteps = int(chunks[2])
+                    elif(chunks[0]=='timelimit'):
+                        self.LevMar_timelimit = float(chunks[2])
+                    elif(chunks[0]=='bumperpower'):
+                        self.LevMar_bumperpower = float(chunks[2])
+        if(os.path.exists(pathname + '/' + self.inidir + '/ModelSelector.ini')):
+            with open(pathname + '/' + self.inidir + '/ModelSelector.ini','r') as f:
+                lines = f.read().splitlines()
+                print('ModelSelector --- ',lines) 
+                for line in lines:
+                    chunks = line.split()
+                    if(chunks[0]=='sigmasoverlap'):
+                        self.ModelSelector_sigmasoverlap = float(chunks[2])
+                    elif(chunks[0]=='sigmachisquare'):
+                        self.ModelSelector_sigmachisquare = float(chunks[2])
+                    elif(chunks[0]=='maxmodels'):
+                        self.ModelSelector_maxmodels = int(chunks[2])
+    
+    @staticmethod
+    def find_bin_directory() -> str:
+        """
+        Searches for the RTModel/bin directory in the available site-packages directories.
+
+        :return: The string of the parth to the bin directory.
+        """
+        bin_directory_string = None
+        site_packages_directories = site.getsitepackages()
+        site_packages_directories.append(site.getusersitepackages())
+        for site_packages_directory in site_packages_directories:
+            bin_directory_path = Path(site_packages_directory).joinpath('RTModel/bin')
+            if bin_directory_path.exists():
+                bin_directory_string = str(bin_directory_path) + '/'
+                break
+        if bin_directory_string is None:
+            raise FileNotFoundError(f'RTModel binary directory not found. Searched {site_packages_directories} '
+                                    f'site-packages directories.')
+        return bin_directory_string

{RTModel-2.0/RTModel/plotmodel → rtmodel-2.1.0/RTModel}/__init__.py

@@ -1,5 +1,5 @@
-__version__ = "2.0.0"
+__version__ = "2.1.0"
 __author__ = 'Valerio Bozza'
 __credits__ = 'University of Salerno, Italy'
 
-from .plotmodel import plotmodel
+from .RTModel import RTModel

rtmodel-2.1.0/RTModel/data/TemplateLibrary.txt

@@ -0,0 +1,59 @@
+113
+0.7 0.5 0.1 1.35 0.01 0.07511 1.12127
+0.7 0.1 0.1 4.6 0.01 -0.00676 0.1493
+0.7 0.1 0.75 4.6 0.01 -0.74331 0.53977
+0.9 0.03 -0.15 2.0 0.01 0.06576 0.09019
+0.9 0.03 -0.2 2.3 0.01 -0.47211 0.01011
+1.5 0.5 0.1 3.2 0.01 -0.32531 0.63255
+1.5 0.5 0.3 2.8 0.01 0.58817 0.78162
+0.9 0.03 -0.3 1.8 0.01 -0.28464 0.14202
+1.5 0.5 0.3 2.9 0.01 -0.48885 0.56195
+1.5 0.5 0.3 2.9 0.01 0.39245 0.56195
+1.5 0.5 0.25 2.75 0.01 0.66775 0.73845
+1.5 0.5 0.35 2.2 0.01 0.06007 0.6458
+1.5 0.5 0.35 2.2 0.01 0.5378 0.6458
+1.5 0.5 0.25 2.5 0.01 -0.45776 0.09626
+1.5 0.5 0.25 2.5 0.01 -0.45776 0.58665
+1.5 0.5 0.25 2.5 0.01 0.09626 0.58665
+1.5 0.5 0.25 2.0 0.01 -0.04058 0.2958
+1.5 0.5 0.25 2.0 0.01 -0.04058 0.47182
+1.5 0.5 0.25 2.0 0.01 0.2958 0.47182
+1.5 0.5 0.7 1.5 0.01 -0.07965 -0.01574
+1.5 0.5 0.7 1.5 0.01 -0.07965 0.34594
+1.5 0.5 0.7 1.5 0.01 -0.01574 0.34594
+1.5 0.5 0.45 4.6 0.01 -0.40928 0.27708
+1.5 0.5 0.45 4.6 0.01 -0.04946 0.27708
+1.5 0.5 0.33 3.2 0.01 -0.36736 0.65181
+0.9 0.1 -0.45 1.65 0.01 -0.4663 -0.00103
+0.9 0.1 -0.45 1.65 0.01 -0.4663 0.37168
+0.9 0.1 -0.45 1.65 0.01 -0.00103 0.37168
+2.2 0.5 0.1 3.0 0.01 0.74611 1.18948
+2.2 0.5 0.1 3.0 0.01 1.06918 1.18948
+2.2 0.5 0.35 2.9 0.01 1.07297 1.14242
+2.2 0.5 0.35 2.9 0.01 1.07297 1.28772
+2.2 0.5 0.35 2.9 0.01 1.14242 1.28772
+2.2 0.5 0.4 2.8 0.01 0.98474 1.16883
+2.2 0.5 0.4 2.8 0.01 0.98474 1.21577
+2.2 0.5 0.4 2.8 0.01 1.16883 1.21577
+2.2 0.5 1.05 2.0 0.01 0.39398 0.56261
+2.2 0.5 1.05 2.0 0.01 0.39398 0.6566
+2.2 0.5 1.05 2.0 0.01 0.56261 0.6566
+2.2 0.5 0.45 2.7 0.01 -0.67542 0.89586
+2.2 0.5 0.45 2.7 0.01 -0.67542 1.10689
+2.2 0.5 0.45 2.7 0.01 0.89586 1.10689
+2.2 0.5 1.0 1.9 0.01 0.30045 0.39828
+2.2 0.5 1.0 1.9 0.01 0.30045 0.52621
+2.2 0.5 1.0 1.9 0.01 0.39828 0.52621
+2.2 0.5 1.23 1.6 0.01 -0.17028 0.01821
+2.2 0.5 1.23 1.6 0.01 -0.17028 0.05286
+2.2 0.5 1.23 1.6 0.01 0.01821 0.05286
+2.2 0.5 0.35 2.7 0.01 -0.66716 0.7449
+2.2 0.5 0.35 2.7 0.01 -0.66716 1.14629
+2.2 0.5 0.35 2.7 0.01 0.7449 1.14629
+2.2 0.5 0.05 2.95 0.01 -0.64485 0.23071
+2.2 0.5 0.05 2.95 0.01 -0.64485 1.20146
+2.2 0.5 0.05 2.95 0.01 0.23071 1.20146
+2.2 0.5 0.35 3.0 0.01 -0.68509 1.15393
+1.8 0.03 1.0 2.3 0.01 -0.08517 0.72053
+1.8 0.03 1.0 2.3 0.01 -0.08517 0.88924
+1.8 0.03 1.0 2.3 0.01 0.72053 0.88924

{RTModel-2.0 → rtmodel-2.1.0}/RTModel/include/LevMarFit.h

@@ -1,7 +1,7 @@
 // LevMarFit.h
 // Definition of the LevMar and bumper classes for Levenberg-Marquardt fitting
 
-#include <stdio.h>
+#include <cstdio>
 #include "bumper.h"
 #include <regex>
 #include <filesystem>