RTModel 2.2__tar.gz → 2.4__tar.gz

rtmodel-2.4/.github/workflows/build_wheels.yml

@@ -0,0 +1,56 @@
+name: Build
+
+on:
+  push:
+    paths:
+      - '**.cpp'
+      - '**.h'
+      - '**.py'
+      - '**.toml'
+      - '**.yml'
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        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:                            #
+          MACOSX_DEPLOYMENT_TARGET: "10.15" # 
+          CIBW_SKIP: pp*
+        #   CIBW_SOME_OPTION: value
+        #    ...
+        #with:
+        #  package-dir: .
+        #  output-dir: wheelhouse
+        #  config-file: "{package}/pyproject.toml
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build sdist
+        run: pipx run build --sdist
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-sdist
+          path: dist/*.tar.gz
+
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl

{rtmodel-2.2 → rtmodel-2.4}/.github/workflows/run_tests.yml

@@ -1,6 +1,6 @@
 name: run_tests
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   run_tests:

{rtmodel-2.2 → rtmodel-2.4}/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.2 → rtmodel-2.4}/PKG-INFO

@@ -1,20 +1,21 @@
 Metadata-Version: 2.1
 Name: RTModel
-Version: 2.2
+Version: 2.4
 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.6
+Requires-Python: <4,>=3.7
 Requires-Dist: numpy
 Requires-Dist: pytest
 Requires-Dist: matplotlib
 Requires-Dist: tqdm
+Requires-Dist: tabulate
 Requires-Dist: VBMicrolensing>=4.1.0
 Description-Content-Type: text/markdown
 
@@ -40,7 +41,7 @@ A second subpackage **`RTModel.templates`** helps the user in the visualization
 
 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 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.
 
 ## Installation
 

{rtmodel-2.2 → rtmodel-2.4}/README.md

@@ -20,7 +20,7 @@ A second subpackage **`RTModel.templates`** helps the user in the visualization
 
 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 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.
 
 ## Installation
 

{rtmodel-2.2 → rtmodel-2.4}/RTModel/RTModel.py

@@ -80,13 +80,16 @@ 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)
             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,11 +127,8 @@ 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
             while(peaksearch):
@@ -141,9 +141,16 @@ class RTModel:
                         for i in range(0,npeaks):
                             print(f'{float(f.readline().split()[0]):.4f}',end = '  ')
             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 = 5, timelimit = 600.0, maxsteps = 50, bumperpower = 2.0):
+    def config_LevMar(self, nfits = 6, offsetdegeneracy = 3, 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
+        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
@@ -160,6 +167,7 @@ class RTModel:
                 f.write(line)
         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')
@@ -167,18 +175,22 @@ class RTModel:
                 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)
-        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)):
             os.makedirs(self.eventname + '/' + self.inidir)
         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')
@@ -204,18 +216,24 @@ 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()
+                        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
                         processes.pop(i)
                         procnumbers.pop(i)
                         procepochs.pop(i)
@@ -237,6 +255,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')
  
@@ -263,25 +286,31 @@ 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):
         phase =0
@@ -317,7 +346,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
@@ -435,6 +464,8 @@ class RTModel:
                     chunks = line.split()
                     if(chunks[0]=='nfits'):
                         self.LevMar_nfits = int(chunks[2])
+                    if(chunks[0]=='offsetdegeneracy'):
+                        self.LevMar_offsetdegeneracy = int(chunks[2])
                     elif(chunks[0]=='maxsteps'):
                         self.LevMar_maxsteps = int(chunks[2])
                     elif(chunks[0]=='timelimit'):

{rtmodel-2.2 → rtmodel-2.4}/RTModel/__init__.py

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

{rtmodel-2.2 → rtmodel-2.4}/RTModel/include/bumper.h

@@ -14,6 +14,7 @@ public:
 	int nps;
 	char modelcode[16];
 	int il;
+	bool duplicate;
 	bumper(double *,int);
 	~bumper();
 	void SetCurvature(double *,double);
@@ -29,4 +30,4 @@ double Determinant(double *,int);
 void Inverse(double*, double*, int);
 void CombineCovariances(bumper*, bumper*, double *Cov, double * Curv, int);
 
-#endif
+#endif

{rtmodel-2.2 → rtmodel-2.4}/RTModel/lib/Finalizer.cpp

@@ -44,6 +44,7 @@ int main(int argc, char* argv[]) {
 	bumper* bumperlist = 0, * scanbumper, * scanbumper2;
 
 
+	setbuf(stdout, nullptr);
 	printf("******************************************\n");
 	printf("**********     Finalizer    *********\n");
 	printf("******************************************\n\n\n");
@@ -285,69 +286,99 @@ int main(int argc, char* argv[]) {
 	}
 
 	// Making assessment. Each category is tested against nested ones
+	vector<int> dependencies[] = {  {},
+									{0},
+									{0},
+									{0,1,2},
+									{0},
+									{0,1,4},
+									{0,1,4,5},
+									{0,1,4,5,6},
+									{0,4},
+									{0,1,4,5},
+									};
+	double modelthrs[ncategories];
 
-	if (chis[1] > chis[0] - thrs[npss[1] - npss[0]]) {
-		chis[1] = 1.e100;
-	}
-	if (chis[2] > chis[0] - thrs[npss[2] - npss[0]]) {
-		chis[2] = 1.e100;
-	}
-	if (chis[3] > chis[0] - thrs[npss[3] - npss[0]] || chis[3] > chis[1] - thrs[npss[3] - npss[1]] || chis[3] > chis[2] - thrs[npss[3] - npss[2]]) {
-		chis[3] = 1.e100;
-	}
-	if (chis[4] > chis[0] - thrs[npss[4] - npss[0]]) {
-		chis[4] = 1.e100;
-	}
-	if (chis[5] > chis[0] - thrs[npss[5] - npss[0]] || chis[5] > chis[1] - thrs[npss[5] - npss[1]] || chis[5] > chis[4] - thrs[npss[5] - npss[4]]) {
-		chis[5] = 1.e100;
-	}
-	if (chis[6] > chis[0] - thrs[npss[6] - npss[0]] || chis[6] > chis[1] - thrs[npss[6] - npss[1]] || chis[6] > chis[4] - thrs[npss[6] - npss[4]] || chis[6] > chis[5] - thrs[npss[6] - npss[5]]) {
-		chis[6] = 1.e100;
-	}
-	if (chis[7] > chis[0] - thrs[npss[7] - npss[0]] || chis[7] > chis[1] - thrs[npss[7] - npss[1]] || chis[7] > chis[4] - thrs[npss[7] - npss[4]] || chis[7] > chis[5] - thrs[npss[7] - npss[5]] || chis[7] > chis[6] - thrs[npss[7] - npss[6]]) {
-		chis[7] = 1.e100;
-	}
-	if (chis[8] > chis[0] - thrs[npss[8] - npss[0]] || chis[8] > chis[4] - thrs[npss[8] - npss[4]]) {
-		chis[8] = 1.e100;
-	}
-	if (chis[9] > chis[0] - thrs[npss[9] - npss[0]] || chis[9] > chis[1] - thrs[npss[9] - npss[1]] || chis[9] > chis[4] - thrs[npss[9] - npss[4]] || chis[9] > chis[5] - thrs[npss[9] - npss[5]]) {
-		chis[9] = 1.e100;
+	for (int icat = 0; icat < ncategories; icat++) {
+		modelthrs[icat] = thsigma;
+		for (int jdep = 0; jdep < dependencies[icat].size(); jdep++) {
+			double thr= chis[dependencies[icat][jdep]] - thrs[npss[icat] - npss[dependencies[icat][jdep]]];
+			if (thr < modelthrs[icat]) modelthrs[icat] = thr;
+		}
+		if (chis[icat] > modelthrs[icat]) {
+			chis[icat] = 1.e100;
+		}
 	}
 
+	//if (chis[1] > chis[0] - thrs[npss[1] - npss[0]]) {
+	//	chis[1] = 1.e100;
+	//}
+	//if (chis[2] > chis[0] - thrs[npss[2] - npss[0]]) {
+	//	chis[2] = 1.e100;
+	//}
+	//if (chis[3] > chis[0] - thrs[npss[3] - npss[0]] || chis[3] > chis[1] - thrs[npss[3] - npss[1]] || chis[3] > chis[2] - thrs[npss[3] - npss[2]]) {
+	//	chis[3] = 1.e100;
+	//}
+	//if (chis[4] > chis[0] - thrs[npss[4] - npss[0]]) {
+	//	chis[4] = 1.e100;
+	//}
+	//if (chis[5] > chis[0] - thrs[npss[5] - npss[0]] || chis[5] > chis[1] - thrs[npss[5] - npss[1]] || chis[5] > chis[4] - thrs[npss[5] - npss[4]]) {
+	//	chis[5] = 1.e100;
+	//}
+	//if (chis[6] > chis[0] - thrs[npss[6] - npss[0]] || chis[6] > chis[1] - thrs[npss[6] - npss[1]] || chis[6] > chis[4] - thrs[npss[6] - npss[4]] || chis[6] > chis[5] - thrs[npss[6] - npss[5]]) {
+	//	chis[6] = 1.e100;
+	//}
+	//if (chis[7] > chis[0] - thrs[npss[7] - npss[0]] || chis[7] > chis[1] - thrs[npss[7] - npss[1]] || chis[7] > chis[4] - thrs[npss[7] - npss[4]] || chis[7] > chis[5] - thrs[npss[7] - npss[5]] || chis[7] > chis[6] - thrs[npss[7] - npss[6]]) {
+	//	chis[7] = 1.e100;
+	//}
+	//if (chis[8] > chis[0] - thrs[npss[8] - npss[0]] || chis[8] > chis[4] - thrs[npss[8] - npss[4]]) {
+	//	chis[8] = 1.e100;
+	//}
+	//if (chis[9] > chis[0] - thrs[npss[9] - npss[0]] || chis[9] > chis[1] - thrs[npss[9] - npss[1]] || chis[9] > chis[4] - thrs[npss[9] - npss[4]] || chis[9] > chis[5] - thrs[npss[9] - npss[5]]) {
+	//	chis[9] = 1.e100;
+	//}
+
 	// If more complicated category has survived, all nested categories are removed
 
-	if (chis[9] < 1.e99) {
-		chis[5] = chis[4] = chis[1] = chis[0] = 1.e100;
-	}
-	if (chis[8] < 1.e99) {
-		chis[4] = chis[0] = 1.e100;
-	}
-	if (chis[7] < 1.e99) {
-		chis[6] = chis[5] = chis[4] = chis[1] = chis[0] = 1.e100;
-	}
-	if (chis[6] < 1.e99) {
-		chis[5] = chis[4] = chis[1] = chis[0] = 1.e100;
-	}
-	if (chis[5] < 1.e99) {
-		chis[4] = chis[1] = chis[0] = 1.e100;
-	}
-	if (chis[4] < 1.e99) {
-		chis[0] = 1.e100;
-	}
-	if (chis[3] < 1.e99) {
-		chis[2] = chis[1] = chis[0] = 1.e100;
-	}
-	if (chis[2] < 1.e99) {
-		chis[0] = 1.e100;
-	}
-	if (chis[1] < 1.e99) {
-		chis[0] = 1.e100;
+	for (int icat = ncategories - 1; icat > 0; icat--) {
+		if (chis[icat] < 1.e99) {
+			for (int jdep = 0; jdep < dependencies[icat].size(); jdep++) {
+				chis[dependencies[icat][jdep]] = 1.e100;
+			}
+		}
 	}
+	//if (chis[9] < 1.e99) {
+	//	chis[5] = chis[4] = chis[1] = chis[0] = 1.e100;
+	//}
+	//if (chis[8] < 1.e99) {
+	//	chis[4] = chis[0] = 1.e100;
+	//}
+	//if (chis[7] < 1.e99) {
+	//	chis[6] = chis[5] = chis[4] = chis[1] = chis[0] = 1.e100;
+	//}
+	//if (chis[6] < 1.e99) {
+	//	chis[5] = chis[4] = chis[1] = chis[0] = 1.e100;
+	//}
+	//if (chis[5] < 1.e99) {
+	//	chis[4] = chis[1] = chis[0] = 1.e100;
+	//}
+	//if (chis[4] < 1.e99) {
+	//	chis[0] = 1.e100;
+	//}
+	//if (chis[3] < 1.e99) {
+	//	chis[2] = chis[1] = chis[0] = 1.e100;
+	//}
+	//if (chis[2] < 1.e99) {
+	//	chis[0] = 1.e100;
+	//}
+	//if (chis[1] < 1.e99) {
+	//	chis[0] = 1.e100;
+	//}
 
 	// Models of discarded categories or with chi square higher than threshold are removed
 
 	for (scanbumper = bumperlist; scanbumper; scanbumper = scanbumper->next) {
-		if (scanbumper->Amp > thsigma || chis[scanbumper->il] > 1.e99) scanbumper->modelcode[0] = 'N';
+		if (scanbumper->Amp > modelthrs[scanbumper->il] || chis[scanbumper->il] > 1.e99) scanbumper->modelcode[0] = 'N';
 	}
 
 	// Counting good models

{rtmodel-2.2 → rtmodel-2.4}/RTModel/lib/InitCond.cpp

@@ -21,7 +21,7 @@ char systemslash = '/';
 
 // Main global parameters
 int nobspeaks = 2; // Number of peaks in the observed light curve to be considered for setting initial conditions.
-double sigmathr = 5.; // Number of sigmas for spline approximation
+double sigmathr = 5.; // Number of sigmas for spline approximation currently set to 0.5 peakthr
 double peakthr = 10.; // Number of sigmnas necessary for a deviation to be identified as a maximum or a minimum.
 int maxoldmodels = 4; // Maximum number of old models to include in new run as initial conditions
 bool override = false; // Override peak identification and manually set peak times
@@ -72,6 +72,7 @@ int main(int argc, char* argv[])
 	dataset** peaklist, * cpeaks, * newpeaks;
 	datapoint* p, * pm, * pmm, * pl, * pr, * pasy = 0, * highestpeak, * minimum, * startsection, * endsection, * sectionpeak;
 
+	setbuf(stdout, nullptr);
 
 	// Directory preliminaries. Reads event name from arguments.
 
@@ -93,6 +94,9 @@ int main(int argc, char* argv[])
 
 	printf("\n\n- Event: %s\n", eventname);
 
+	if (!exists(eventname)) {
+		throw(1);
+	}
 	current_path(eventname);
 
 
@@ -146,7 +150,7 @@ int main(int argc, char* argv[])
 				if (strcmp(command, "override") == 0) {
 					fscanf(f, " %lf", &value2);
 					override = true;
-					sscanf(value,"%lf",&t1);
+					sscanf(value, "%lf", &t1);
 					t2 = value2;
 				}
 				if (strcmp(command, "npeaks") == 0) {
@@ -223,7 +227,7 @@ int main(int argc, char* argv[])
 	if (onlyupdate) {
 		newpeaks = new dataset;
 		newpeaks->length = 0;
-		newpeaks->first = newpeaks->last=0;
+		newpeaks->first = newpeaks->last = 0;
 	}
 	else {
 
@@ -254,6 +258,10 @@ int main(int argc, char* argv[])
 
 			f = fopen("LCToFit.txt", "r");
 			fscanf(f, "%d", &np);
+			if (np == 0) {
+				printf("\n! No data !");
+				return -1;
+			}
 
 			nfil = 1;
 			dn = 0;
@@ -271,6 +279,10 @@ int main(int argc, char* argv[])
 				dn = ifil;
 			}
 			fclose(f);
+			if (np == 0) {
+				printf("\n! No datasets match the chosen satellite!\n  Check your usesatellite option.");
+				return -1;
+			}
 			np++;
 
 			tt = (double*)malloc(sizeof(double) * np);
@@ -878,7 +890,7 @@ int main(int argc, char* argv[])
 
 	current_path(eventname);
 
-	dn = 0; 
+	dn = 0;
 	if (strstr(modelcategories, "PS") != 0) {
 		filebest = regex("PS.*\\.txt");
 		strcpy(fileinit, "InitCondPS.txt");

{rtmodel-2.2 → rtmodel-2.4}/RTModel/lib/LevMar.cpp

@@ -3,10 +3,10 @@
 
 #include "LevMarFit.h"
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
-	LevMar *MyLevMar= new LevMar(argc,argv);
-	MyLevMar->Run();
+	LevMar* MyLevMar = new LevMar(argc, argv);
+	int err = MyLevMar->Run();
 	delete MyLevMar;
-    return 0;
+	return err;
 }