RTModel 2.3__tar.gz → 3.0__tar.gz

{rtmodel-2.3 → rtmodel-3.0}/.github/workflows/build_wheels.yml

@@ -1,6 +1,13 @@
 name: Build
 
-on: [push]
+on:
+  push:
+    paths:
+      - '**.cpp'
+      - '**.h'
+      - '**.py'
+      - '**.toml'
+      - '**.yml'
 
 jobs:
   build_wheels:
@@ -8,15 +15,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # macos-13 is an intel runner, macos-14 is apple silicon
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-13,macos-14] # was macos-latest
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.22.0
-        # env:
+        env:                            #
+          MACOSX_DEPLOYMENT_TARGET: "10.15" # 
+          CIBW_SKIP: pp*
         #   CIBW_SOME_OPTION: value
         #    ...
         #with:

{rtmodel-2.3 → rtmodel-3.0}/CMakeLists.txt

@@ -11,6 +11,20 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     endif()
 endif()
 
+# Find directory of VBMicrolensing
+
+find_package(Python3 COMPONENTS Interpreter Development)
+set(Python3_EXECUTABLE "./python")
+
+execute_process(
+    COMMAND ${PYTHON_EXECUTABLE} fVBM.py   
+    #-c "import sys, os, inspect; sys.path.extend(os.environ['PYTHONPATH'].split(os.pathsep));  mod = __import__('VBMicrolensing'); dir1=os.path.dirname(inspect.getfile(mod)); print(dir1.replace(\"\\\",\"/\"))"
+    OUTPUT_VARIABLE VBMICROLENSING_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+message(STATUS "Installation directory of VBMicrolensing: ${VBMICROLENSING_DIR}")
+
+
 # Build executables
 # =================
 
@@ -20,9 +34,8 @@ 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/VBMicrolensingLibrary.cpp)
-target_include_directories(LevMar PRIVATE RTModel/include)
+add_executable(LevMar RTModel/lib/bumper.cpp RTModel/lib/LevMar.cpp RTModel/lib/LevMarFit.cpp ${VBMICROLENSING_DIR}/lib/VBMicrolensingLibrary.cpp)
+target_include_directories(LevMar PRIVATE RTModel/include ${VBMICROLENSING_DIR}/lib)
 
 add_executable(ModelSelector RTModel/lib/bumper.cpp RTModel/lib/ModelSelector.cpp)
 target_include_directories(ModelSelector PRIVATE RTModel/include)

{rtmodel-2.3 → rtmodel-3.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: RTModel
-Version: 2.3
+Version: 3.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: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Classifier: Programming Language :: Python :: 3
 Project-URL: Homepage, https://github.com/valboz/RTModel
 Requires-Python: <4,>=3.7
@@ -15,11 +15,12 @@ Requires-Dist: numpy
 Requires-Dist: pytest
 Requires-Dist: matplotlib
 Requires-Dist: tqdm
-Requires-Dist: VBMicrolensing>=4.1.0
+Requires-Dist: tabulate
+Requires-Dist: VBMicrolensing>=5.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:
+`RTModel` is a package for modeling and interpretation of microlensing events. It uses photometric and/or astrometric 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)
@@ -36,11 +37,11 @@ A second subpackage **`RTModel.templates`** helps the user in the visualization
 
 ## 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)). 
+`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](https://projects.phys.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. We also thank all the users who are providing suggestions, reporting bugs or failures: Etienne Bachelet, David Bennett, Jonathan Brashear, Stela Ishitani Silva, Yiannis Tsapras, Keto Zhang.
+We are grateful to Greg Olmschenk, who revised the package installation in order to make it as cross-platform as possible. We also thank all the users who are providing suggestions, reporting bugs or failures: Etienne Bachelet, David Bennett, Jonathan Brashear, Laura Salmeri, Stela Ishitani Silva, Yiannis Tsapras, Sigfried Vanaverbeke, Keto Zhang.
 
 ## Installation
 
@@ -60,9 +61,9 @@ In alternative, you may directly install it from PyPI without cloning this repos
 pip install RTModel
 ```
 
-Currently, `RTModel` works on Linux, Windows and MacOS, requiring Python >= 3.6. 
+Currently, `RTModel` works on Linux, Windows and MacOS, requiring Python >= 3.7. 
 A C++ compiler compatible with C++17 standard is needed for installation.
-`RTModel` also incorporates version 4.1 of [`VBMicrolensing`](https://github.com/valboz/VBMicrolensing). You are encouraged to cite the relevant papers listed in that repository as well.
+`RTModel` uses [`VBMicrolensing`](https://github.com/valboz/VBMicrolensing) for all calculations. You are encouraged to cite the relevant papers listed in that repository as well.
 
 ## Documentation
 Full [documentation for the use of RTModel](docs/README.md) is available.

{rtmodel-2.3 → rtmodel-3.0}/README.md

@@ -1,5 +1,5 @@
 # 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:
+`RTModel` is a package for modeling and interpretation of microlensing events. It uses photometric and/or astrometric 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)
@@ -16,11 +16,11 @@ A second subpackage **`RTModel.templates`** helps the user in the visualization
 
 ## 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)). 
+`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](https://projects.phys.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. We also thank all the users who are providing suggestions, reporting bugs or failures: Etienne Bachelet, David Bennett, Jonathan Brashear, Stela Ishitani Silva, Yiannis Tsapras, Keto Zhang.
+We are grateful to Greg Olmschenk, who revised the package installation in order to make it as cross-platform as possible. We also thank all the users who are providing suggestions, reporting bugs or failures: Etienne Bachelet, David Bennett, Jonathan Brashear, Laura Salmeri, Stela Ishitani Silva, Yiannis Tsapras, Sigfried Vanaverbeke, Keto Zhang.
 
 ## Installation
 
@@ -40,9 +40,9 @@ In alternative, you may directly install it from PyPI without cloning this repos
 pip install RTModel
 ```
 
-Currently, `RTModel` works on Linux, Windows and MacOS, requiring Python >= 3.6. 
+Currently, `RTModel` works on Linux, Windows and MacOS, requiring Python >= 3.7. 
 A C++ compiler compatible with C++17 standard is needed for installation.
-`RTModel` also incorporates version 4.1 of [`VBMicrolensing`](https://github.com/valboz/VBMicrolensing). You are encouraged to cite the relevant papers listed in that repository as well.
+`RTModel` uses [`VBMicrolensing`](https://github.com/valboz/VBMicrolensing) for all calculations. You are encouraged to cite the relevant papers listed in that repository as well.
 
 ## Documentation
 Full [documentation for the use of RTModel](docs/README.md) is available.

{rtmodel-2.3 → rtmodel-3.0}/RTModel/RTModel.py

@@ -32,7 +32,10 @@ class RTModel:
             self.eventname = os.getcwd()
         else:
             self.eventname = os.path.realpath(event)
-            print("Event name: " + self.eventname)
+            if(os.path.exists(self.eventname)):
+                print("Event name: " + self.eventname)
+            else:
+                print("! Invalid path for event: " + self.eventname)
         self.inidir = "ini"
         self.modelcodes = ['PS', 'PX', 'BS', 'BO', 'LS', 'LX', 'LO', 'LK', 'TS', 'TX']
         self.endphase =  len(self.modelcodes)*2+3
@@ -44,15 +47,40 @@ class RTModel:
         self.config_LevMar()
         self.config_ModelSelector()
         self.satellitedir = '.'
-
+        self.astrometric = False
+        self.parameters_ranges = {'PS': [[-11.,1.0, 1.0],[-4.6, 7.6, 1.0],[-300,300,5.0],[-11.5,2.3,2.3]],
+                                  'PX': [[-3.0,3.0, 0.5],[-4.6, 7.6, 1.0],[-300,300,5.0],[-11.5,2.3,2.3],[-3.0,3.0,0.1],[-3.0,3.0,0.1]],
+                                  'BS': [[-4.6,7.6,1.0],[-11.5,0.0,0.5],[0,3.0,0.5],[0,3.0,0.5],[-300,300,1.0],[-300,300,1.0],[-11.5,2.3,2.3]],
+                                  'BO': [[-4.6,7.6,1.0],[-11.5,0.0,0.5],[0,3.0,0.5],[0,3.0,0.5],[-300,300,1.0],[-300,300,1.0],[-11.5,2.3,2.3],
+                                         [-3.0,3.0,0.03],[-3.0,3.0,0.03],[-1.0,1.0,0.01],[-1.0,1.0,0.01],[1.e-7,1.0,0.01]],
+                                  'LS': [[-4.0,3.0,.1],[-16.1,16.1,0.5],[-3.0,3.0,0.1], [-12.56,12.56,0.1],[-11.5,-2.5,0.3],[-4.6,7.6,0.6],
+                                         [-300,300,5.0]],
+                                  'LX': [[-4.0,3.0,.1],[-16.1,16.1,0.5],[-3.0,3.0,0.1], [-12.56,12.56,0.1],[-11.5,-2.5,0.3],[-4.6,7.6,0.6],
+                                         [-300,300,5.0],[-3.0,3.0,0.03],[-3.0,3.0,0.03]],
+                                  'LO': [[-4.0,3.0,.1],[-16.1,16.1,0.5],[-3.0,3.0,0.1], [-12.56,12.56,0.1],[-11.5,-2.5,0.3],[-4.6,7.6,0.6],
+                                         [-300,300,5.0],[-3.0,3.0,0.03],[-3.0,3.0,0.03],[-1.0,1.0,0.01],[-1.0,1.0,0.01],[1.e-7,1.0,0.01]],
+                                  'LK': [[-4.0,3.0,.1],[-16.1,16.1,0.5],[-3.0,3.0,0.1], [-12.56,12.56,0.1],[-11.5,-2.5,0.3],[-4.6,7.6,0.6],
+                                         [-300,300,5.0],[-3.0,3.0,0.03],[-3.0,3.0,0.03],[-1.0,1.0,0.01],[-1.0,1.0,0.01],[1.e-7,1.0,0.01],
+                                        [-10,10,0.1],[0.5001,10,0.1]],
+                                  'TS': [[-4.0,3.0,.1],[-16.1,16.1,0.5],[-3.0,3.0,0.1], [-12.56,12.56,0.1],[-11.5,-2.5,0.3],[-4.6,7.6,0.6],
+                                         [-300,300,5.0],[-4.0,3.0,0.3],[-11.5,11.5,0.5], [-12.56,12.56,0.3]],
+                                  'TX': [[-4.0,3.0,.1],[-16.1,16.1,0.5],[-3.0,3.0,0.1], [-12.56,12.56,0.1],[-11.5,-2.5,0.3],[-4.6,7.6,0.6],
+                                         [-300,300,5.0],[-4.0,3.0,0.3],[-11.5,11.5,0.5], [-12.56,12.56,0.3],[-3.0,3.0,0.03],[-3.0,3.0,0.03]],
+                                  'astrometry': [[-30.0,30.0,1.0],[-30.0,30.0,1.0],[0.05,1.0,0.1],[0.001,30.0,0.2]]
+                                 }		                                  
+	
     def set_processors(self, nprocessors):
         self.nprocessors = nprocessors
 
     def set_event(self, event):
         self.eventname = os.path.realpath(event)
+        if(not os.path.exists(self.eventname)):
+            print("! Invalid path for event: " + self.eventname)
 
     def set_satellite_dir(self, satellitedir):
-        self.satellitedir = satellitedir
+        self.satellitedir = os.path.realpath(satellitedir)
+        if(not os.path.exists(self.satellitedir)):
+            print("! Invalid path for satellite directory: " + self.satellitedir)
 
     def set_constraints(self, constraints = None):
         self.constraints = constraints
@@ -62,7 +90,21 @@ class RTModel:
             for cons in constraints:
                 f.write(cons[0] + ' = '+ str(cons[1]) + ' '+ str(cons[2]) + ' '+ str(cons[3]) + ' ' + '\n')
 
-    def config_Reader(self, tau = 0.1, binning = 4000, otherseasons = 1, renormalize = 1, thresholdoutliers = 10):
+    def set_parameter_ranges(self):
+        if(not os.path.exists(self.eventname + '/' + self.inidir)):
+            os.makedirs(self.eventname + '/' + self.inidir)
+        with open(self.eventname + '/' + self.inidir + '/Parameters_Ranges.ini','w') as f:
+            for modelcode in self.modelcodes:
+                f.write(modelcode + '\n')
+                for par in self.parameters_ranges[modelcode]:
+                    f.write(str(par[0]) + ' ' + str(par[1]) + ' ' + str(par[2]) + '\n')
+            modelcode = 'astrometry'    
+            f.write(modelcode + '\n')
+            for par in self.parameters_ranges[modelcode]:
+                f.write(str(par[0]) + ' ' + str(par[1]) + ' ' + str(par[2]) + '\n')
+        
+
+    def config_Reader(self, tau = 0.1, binning = 4000, otherseasons = 100, renormalize = 1, thresholdoutliers = 10):
         self.Reader_tau= tau # conventional correlation time for consecutive points
         self.Reader_binning = binning # maximum number of points left after re-binning
         self.Reader_otherseasons = otherseasons # How to use other seasons (0 = Yes, 1 = decrease significance, 2 = remove)
@@ -80,13 +122,25 @@ class RTModel:
             f.write('thresholdoutliers = ' + str(self.Reader_thresholdoutliers) + '\n')
         print('- Launching: Reader')
         print('  Pre-processing data...')
-        completedprocess = subprocess.run([self.bindir+self.readerexe,self.eventname], cwd = self.bindir, shell = False, stdout=subprocess.DEVNULL)
-        if(completedprocess.returncode != 0):
-            print('! Error in pre-processing. Please check your data!')            
-            self.done = True
-        else:
+        try:
+            completedprocess=subprocess.run([self.bindir+self.readerexe,self.eventname], cwd = self.bindir, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True, text = True)
+            with open(self.eventname + '/LCToFit.txt') as f:
+                lines = f.readlines()
+                del(lines[0])
+                self.astrometric = False
+                for line in lines:
+                    if(float(line.split()[6])>0):
+                        self.astrometric = True
+                        print('  Astrometric data found: static models will be skipped')
+                        break                    
             print('  OK')
-
+        except subprocess.CalledProcessError as e:
+            print('\033[30;41m! Error in pre-processing. Please check your data!\033[m')
+            print('\033[30;43m'+e.stdout+'\033[m')
+            print('\033[30;43m'+e.stderr+'\033[m')
+            print('\033[30;41m! Program stopped here!\033[m')
+            self.done = True
+ 
     def config_InitCond(self, npeaks = 2, peakthreshold = 10.0, oldmodels = 4, override = None, nostatic = False, onlyorbital = False, usesatellite = 0
                        , templatelibrary = None, modelcategories = ['PS','PX','BS','BO','LS','LX','LO'], onlyupdate =False):
         self.InitCond_npeaks = npeaks # Number of peaks in the observed light curve to be considered for setting initial conditions.
@@ -124,15 +178,12 @@ class RTModel:
                 f.write('onlyupdate = 1\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)
-        if(completedprocess.returncode != 0):
-            print('! Error in setting initial conditions!')
-            self.done = True
-        else:
+        try:
+            completedprocess=subprocess.run([self.bindir+self.initcondexe,self.eventname], cwd = self.bindir, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True, text = True)
             peaksearch = True
-            i=0
+            imod=0
             while(peaksearch):
-                initfils=glob.glob(self.eventname + '/InitCond/InitCond'+ self.modelcodes[i] + '*')
+                initfils=glob.glob(self.eventname + '/InitCond/InitCond'+ self.modelcodes[imod] + '*')
                 if(len(initfils)!=0):
                     peaksearch = False
                     with open(initfils[0], 'r') as f:
@@ -140,14 +191,29 @@ class RTModel:
                         print('Peaks:  ',end ='')
                         for i in range(0,npeaks):
                             print(f'{float(f.readline().split()[0]):.4f}',end = '  ')
+                imod+=1
             print('\n  OK')
+        except subprocess.CalledProcessError as e:
+            print('\033[30;41m! Error in setting initial conditions!\033[m')
+            print('\033[30;43m'+e.stdout+'\033[m')
+            print('\033[30;43m'+e.stderr+'\033[m')
+            print('\033[30;41m! Program stopped here!\033[m')
+            self.done = True
 
-    def config_LevMar(self, nfits = 6, offsetdegeneracy = 3, timelimit = 600.0, maxsteps = 50, bumperpower = 2.0):
+    def config_LevMar(self, nfits = 6, offsetdegeneracy = 3, timelimit = 600.0, maxsteps = 50, bumperpower = 2.0, \
+                      mass_luminosity_exponent = None, mass_radius_exponent = None, lens_mass_luminosity_exponent = None, \
+                     turn_off_secondary_source = False, turn_off_secondary_lens = False):
         self.LevMar_nfits = nfits # Number of models to be calculated from the same initial condition using the bumper method
         self.LevMar_offsetdegeneracy = offsetdegeneracy # Number of models to be fit after applying offset degeneracy to best model found so far
         self.LevMar_maxsteps = maxsteps # Maximum number of steps in each fit
         self.LevMar_timelimit = timelimit # Maximum time in seconds for total execution
         self.LevMar_bumperpower = bumperpower # Repulsion factor of bumpers
+        self.LevMar_mass_luminosity_exponent = mass_luminosity_exponent # mass-luminosity exponent for binary sources
+        self.LevMar_mass_radius_exponent = mass_radius_exponent # mass-radius exponent for binary sources
+        self.LevMar_lens_mass_luminosity_exponent = lens_mass_luminosity_exponent # mass-luminosity exponent for binary lenses
+        self.LevMar_turn_off_secondary_lens = turn_off_secondary_lens # Option for dark secondary lenses
+        self.LevMar_turn_off_secondary_source = turn_off_secondary_source # Option for dark secondary sources
+        self.LevMar_stepchainsave = False # If True, step chains are saved
     
     def LevMar(self,strmodel, parameters_file = None, parameters = None):
         if(not os.path.exists(self.eventname + '/' + self.inidir)):
@@ -159,22 +225,38 @@ class RTModel:
                 for fl in parameters:
                     line = line + str(fl) + ' '
                 f.write(line)
+        self.set_parameter_ranges()
         with open(self.eventname + '/' + self.inidir + '/LevMar.ini','w') as f:
             f.write('nfits = ' + str(self.LevMar_nfits) + '\n')
             f.write('offsetdegeneracy = ' + str(self.LevMar_offsetdegeneracy) + '\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(self.LevMar_mass_luminosity_exponent != None):
+                f.write('mass_luminosity_exponent = ' + str(self.LevMar_mass_luminosity_exponent) + '\n')
+            if(self.LevMar_mass_radius_exponent != None):
+                f.write('mass_radius_exponent = ' + str(self.LevMar_mass_radius_exponent) + '\n')
+            if(self.LevMar_mass_luminosity_exponent != None):
+                f.write('lens_mass_luminosity_exponent = ' + str(self.LevMar_lens_mass_luminosity_exponent) + '\n')
+            if(self.LevMar_turn_off_secondary_lens):
+                f.write('turn_off_secondary_lens = True\n')
+            if(self.LevMar_turn_off_secondary_source):
+                f.write('turn_off_secondary_source = True\n')
             if(parameters_file != None):
                 f.write('parametersfile = ' + parameters_file)
+            if(self.LevMar_stepchainsave):
+                f.write('stepchainsave = True\n')
         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)
-        if(completedprocess.returncode != 0):
-            print('! Error in fit!')
-            self.done = True
-        else:
+        try:
+            completedprocess=subprocess.run([self.bindir+self.levmarexe,self.eventname, strmodel,self.satellitedir], cwd = self.bindir, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True, text = True)
             print('  OK')
+        except subprocess.CalledProcessError as e:
+            print('\033[30;41m! Error in fit!\033[m')
+            print('\033[30;43m'+e.stdout+'\033[m')
+            print('\033[30;43m'+e.stderr+'\033[m')
+            print('\033[30;41m! Program stopped here!\033[m')
+            self.done = True
   
     def launch_fits(self,modelcode):
         if(not os.path.exists(self.eventname + '/' + self.inidir)):
@@ -185,6 +267,18 @@ class RTModel:
             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(self.LevMar_mass_luminosity_exponent != None):
+                f.write('mass_luminosity_exponent = ' + str(self.LevMar_mass_luminosity_exponent) + '\n')
+            if(self.LevMar_mass_radius_exponent != None):
+                f.write('mass_radius_exponent = ' + str(self.LevMar_mass_radius_exponent) + '\n')
+            if(self.LevMar_lens_mass_luminosity_exponent != None):
+                f.write('lens_mass_luminosity_exponent = ' + str(self.LevMar_lens_mass_luminosity_exponent) + '\n')
+            if(self.LevMar_turn_off_secondary_lens):
+                f.write('turn_off_secondary_lens = True\n')
+            if(self.LevMar_turn_off_secondary_source):
+                f.write('turn_off_secondary_source = True\n')
+            if(self.LevMar_stepchainsave):
+                f.write('stepchainsave = True\n')
         stringfits = {'PS' : '- Single-lens-Single-source fits',
                       'PX' : '- Single-lens-Single-source fits with parallax',
                       'BS' : '- Single-lens-Binary-source fits',
@@ -195,6 +289,7 @@ class RTModel:
                       'LK' : '- Binary-lens-Single-source fits with eccentric orbital motion',
                       'TS' : '- Triple-lens-Single-source fits',
                       'TX' : '- Triple-lens-Single-source fits with parallax'}       
+        self.set_parameter_ranges()
         print(stringfits[modelcode])
         initcondfile = self.eventname + '/InitCond/' + 'InitCond'+ modelcode + '.txt'
         if(os.path.exists(initcondfile)):
@@ -207,18 +302,33 @@ class RTModel:
             procepochs = []
             iinitcond = 0
             finitcond = 0
-            finitcondold = -1       
+            finitcondold = -1
+            timeouts = 0
+            crashes = 0
             pbar = tqdm(total = ninitconds,desc = 'Fits completed',file=sys.stdout, colour='GREEN', smoothing = 0)
             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}')
+                        timeouts += 1
+                        crashes -= 1
+                        #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):
+                        if(processes[i].returncode!=0):
+                            crashes +=1
+                        # Here we have to append results to main model file
+                        if(not self.LevMar_stepchainsave):
+                            strmodel = modelcode + '{:0>4}'.format(str(procnumbers[i])) + ".txt"
+                            if(os.path.exists(self.eventname +'/PreModels/' + strmodel)):
+                                with open(self.eventname +'/PreModels/' + strmodel) as f:
+                                    content = f.read()
+                                with open(self.eventname +'/PreModels/'+ modelcode + ".txt","a") as f:
+                                    f.write(content)
+                                os.remove(self.eventname +'/PreModels/' + strmodel)
                         processes.pop(i)
                         procnumbers.pop(i)
                         procepochs.pop(i)
@@ -227,12 +337,12 @@ class RTModel:
                         i += 1
                 while(iinitcond < ninitconds and len(processes) < self.nprocessors):
                     strmodel =  modelcode + '{:0>4}'.format(str(iinitcond))
-                    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
+                    #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
                 if(finitcond != finitcondold):
                     #print('  Fits launched: {}; completed: {}/{}'.format(iinitcond, finitcond, ninitconds))
@@ -240,6 +350,11 @@ class RTModel:
                     finitcondold =finitcond
                 time.sleep(0.1)
             pbar.close()
+            if(crashes>0):
+                print('crashed fits: ' + str(crashes))
+            if(timeouts>0):
+                print('timed out fits: ' + str(timeouts))
+            print('  OK')
         else:
             print('- No initial conditions for this category')
  
@@ -266,27 +381,35 @@ class RTModel:
                         'TS' : '- Selecting models for Triple-lens-Single-source fits',
                         'TX' : '- Selecting models for Triple-lens-Single-source fits with parallax'}   
         print(stringmodels[modelcode])
-        completedprocess = subprocess.run([self.bindir+self.modelselectorexe,self.eventname, modelcode], cwd = self.bindir, shell = False, stdout=subprocess.DEVNULL)
-        if(completedprocess.returncode != 0):
-            print('! Error in model selection!')
-            self.done = True
-        else:
+        try:
+            completedprocess=subprocess.run([self.bindir+self.modelselectorexe,self.eventname, modelcode], cwd = self.bindir, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True, text = True)
             print('  OK')
+        except subprocess.CalledProcessError as e:
+            print('\033[30;41m! Error in model selection!\033[m')
+            print('\033[30;43m'+e.stdout+'\033[m')
+            print('\033[30;43m'+e.stderr+'\033[m')
+            print('\033[30;41m! Program stopped here!\033[m')
+            self.done = True
             
     def Finalizer(self):
         print('- Launching: Finalizer')
         print('  Making final assessment for this event')
-        completedprocess = subprocess.run([self.bindir+self.finalizerexe,self.eventname], cwd = self.bindir, shell = False, stdout=subprocess.DEVNULL)
-        if(completedprocess.returncode != 0):
-            print('! Error in finalization. Maybe there are problems with models')
-            self.done = True
-        else:
+        try:
+            completedprocess=subprocess.run([self.bindir+self.finalizerexe,self.eventname], cwd = self.bindir, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True, text = True)
             with open(self.eventname + '/Nature.txt') as f:
                 for line in f.readlines():
                     print("  " + line,end='')
                 print("  OK")  
+        except subprocess.CalledProcessError as e:
+            print('\033[30;41m! Error in finalization!\033[m')
+            print('\033[30;43m'+e.stdout+'\033[m')
+            print('\033[30;43m'+e.stderr+'\033[m')
+            print('\033[30;41m! Program stopped here!\033[m')
+            self.done = True
 
-    def run(self, event = None, cleanup = False):
+    def run(self, event = None, cleanup = True):
+        if(not cleanup):
+            self.LevMar_stepchainsave = True
         phase =0
         if(event!= None):
             self.eventname = os.path.realpath(event)
@@ -320,7 +443,7 @@ class RTModel:
             elif phase > self.endphase:
                 if(cleanup):
                     print('- Cleaning up preliminary models')
-                    cleanup_preliminary_models()
+                    self.cleanup_preliminary_models()
                 print("- Analysis of " + self.eventname + " successfully completed!")
                 print("o " + time.asctime())
                 self.done = True
@@ -446,6 +569,16 @@ class RTModel:
                         self.LevMar_timelimit = float(chunks[2])
                     elif(chunks[0]=='bumperpower'):
                         self.LevMar_bumperpower = float(chunks[2])
+                    elif(chunks[0] == 'turn_off_secondary_source' and chunks[2] == 'True'):
+                        self.LevMar_turn_off_secondary_source = True
+                    elif(chunks[0] == 'turn_off_secondary_lens' and chunks[2] == 'True'):
+                        self.LevMar_turn_off_secondary_lens = True
+                    elif(chunks[0] == 'mass_luminosity_exponent'):
+                        self.LevMar_mass_luminosity_exponent = float(chunks[2])
+                    elif(chunks[0] == 'mass_radius_exponent'):
+                        self.LevMar_mass_radius_exponent = float(chunks[2])
+                    elif(chunks[0] == 'lens_mass_luminosity_exponent'):
+                        self.LevMar_lens_mass_luminosity_exponent = 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()

{rtmodel-2.3 → rtmodel-3.0}/RTModel/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2"
+__version__ = "3.0"
 __author__ = 'Valerio Bozza'
 __credits__ = 'University of Salerno, Italy'
 

{rtmodel-2.3/RTModel/lib → rtmodel-3.0/RTModel/include}/LevMarFit.h

@@ -24,16 +24,20 @@ class LevMar {
 	int error;
 	int flagblending;
 	path exedir;
+	bool astrometric;
+	int nlinpar;
 
 	double tim0, tm;
 
-	double (VBMicrolensing::* model)(double*, double);
 	int nps;
 	double* sigmapr, * leftlim, * rightlim;
 
-	int* filter, * satel, nfil, np, OGLE;
-	double* t, * y, * w, * delta, * maxdelta, * Curv, * A, * B, * B0, * Cov, * fb, ** Gr, * dFdp, * errs;
+	int* filter, * satel, nfil, np, OGLE, it0, it02;
+	double* t, * y, * w, *y1a, *y2a, * delta, * maxdelta, * Curv, * A, * B, * B0, * Cov, * fb, ** Gr, * dFdp, * errs;
+	double* cN, * cE, * wcN, * wcE, *c1s, *c2s, *c1l, *c2l;
 	double* pr, * prn, * sumy, * sumy2, * sumsigma, * sumfy, * sumf, * sumf2, * limbdarks;
+	double* sumsigmaN, * sumsigmaE, * sumcN, * sumcE, * sumc1, * sumc2;
+	int* sizes, * starts;
 
 	int consnumber, *consindex;
 	double* constraints, * consleft, * consright, *consvars;
@@ -41,8 +45,10 @@ class LevMar {
 
 	double Tol;
 
-	void (LevMar::* PrintOut)(double*);
-	void (LevMar::* PrintFile)(FILE*, double, bool);
+//	void (LevMar::* PrintOut)(double*);
+//	void (LevMar::* PrintFile)(FILE*, double, bool);
+	void PrintOut(double*);
+	void PrintFile(char *filename, int, double, bool);
 
 	bumper* stepchain, * bumperlist, * laststep;
 
@@ -54,38 +60,18 @@ public:
 	void ReadFiles(int, char**);
 	int InitCond(double* presigmapr, double* preleftlim, double* prerightlim);
 	void ReadCurve();
-	void ReadOptions();
-	void Run();
+	void ReadAncillary();
+	void ReadOptions(double *,double *, double *);
+	int Run();
 	double ChiSquared(double*);
 	void Grad();
+	void EvaluateModel(double *pr, int filter, int ips);
 	void Covariance();
 	double ComputeConstraint(double *pr, int i);
 
-	void PrintOutPS(double*);
-	void PrintOutPX(double*);
-	void PrintOutBS(double*);
-	void PrintOutBO(double*);
-	void PrintOutLS(double*);
-	void PrintOutLX(double*);
-	void PrintOutLO(double*);
-	void PrintOutLK(double*);
-	void PrintOutTS(double*);
-	void PrintOutTX(double*);
-
-	void PrintFilePS(FILE*, double, bool);
-	void PrintFilePX(FILE*, double, bool);
-	void PrintFileBS(FILE*, double, bool);
-	void PrintFileBO(FILE*, double, bool);
-	void PrintFileLS(FILE*, double, bool);
-	void PrintFileLX(FILE*, double, bool);
-	void PrintFileLO(FILE*, double, bool);
-	void PrintFileLK(FILE*, double, bool);
-	void PrintFileTS(FILE*, double, bool);
-	void PrintFileTX(FILE*, double, bool);
-
 };
 
 double Determinant(double*, int);
 void Inverse(double*, double*, int);
 
-#endif
+#endif

{rtmodel-2.3 → rtmodel-3.0}/RTModel/include/bumper.h

@@ -4,6 +4,8 @@
 #ifndef _bumper
 #define _bumper
 
+#include<stdio.h>
+
 // Bumper class is the penalty function to be used to fill minima in chi square
 class bumper{
 public:
@@ -13,6 +15,7 @@ public:
 	double Amp;
 	int nps;
 	char modelcode[16];
+	char *buffer;
 	int il;
 	bool duplicate;
 	bumper(double *,int);
@@ -23,6 +26,7 @@ public:
 	void signCovariance(int);
 	void flipCovariance(int, int);
 	double distance(double *);
+	void SetBuffer(FILE*, int, int);
 	bumper *next;
 };
 
@@ -30,4 +34,4 @@ double Determinant(double *,int);
 void Inverse(double*, double*, int);
 void CombineCovariances(bumper*, bumper*, double *Cov, double * Curv, int);
 
-#endif
+#endif