RTModel 2.3__tar.gz → 2.4__tar.gz

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: RTModel
-Version: 2.3
+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.7
@@ -15,6 +15,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
 

{rtmodel-2.3 → 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,6 +141,12 @@ 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 = 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
@@ -169,12 +175,15 @@ 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)):
@@ -207,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)
@@ -240,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')
  
@@ -266,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
@@ -320,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

{rtmodel-2.3 → 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.3 → 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");

{rtmodel-2.3 → 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.3 → 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;
 }

{rtmodel-2.3 → rtmodel-2.4}/RTModel/lib/LevMarFit.cpp

@@ -34,9 +34,9 @@ std::vector<std::vector<std::string>> parnames = { {"u0","tE","t0","rho"},
 					{"s","q","u0","alpha","rho","tE","t0","piN","piE"},
 					{"s","q","u0","alpha","rho","tE","t0","piN","piE","gamma1","gamma2","gammaz"},
 					{"s","q","u0","alpha","rho","tE","t0","piN","piE","gamma1","gamma2","gammaz","sz_s","a_s3d"},
-					{"s","q","u0","alpha","rho","tE","t0","s2","q2","beta"}};
+					{"s","q","u0","alpha","rho","tE","t0","s2","q2","beta"} };
 
-std::vector<std::vector<int>> logposs = {{0, 1, 3},
+std::vector<std::vector<int>> logposs = { {0, 1, 3},
 										{1, 3},
 										{0, 1, 6},
 										{2, 3, 9},
@@ -49,6 +49,7 @@ std::vector<std::vector<int>> logposs = {{0, 1, 3},
 const double epsilon = 1.e-100;
 
 LevMar::LevMar(int argc, char* argv[]) {
+	setbuf(stdout, nullptr);
 	printf("******************************************\n");
 	printf("*************      LevMar     **********\n");
 	printf("******************************************\n\n\n");
@@ -230,7 +231,7 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 				model = &VBMicrolensing::BinSourceSingleLensXallarap;
 				nps = 10;
 				ReadOptions();
-				double presigmapr[] = { 0.1,1,1,0.5,0.3,0.3,0.1,0.3,0.3, 2.3};
+				double presigmapr[] = { 0.1,1,1,0.5,0.3,0.3,0.1,0.3,0.3, 2.3 };
 				double preleftlim[] = { -3.,-1.e100,-6.9,-11.5,-3.,-3.,0,-3,-6,-4.6 };
 				double prerightlim[] = { 3.,1.e100,6.9,0.,3.,3.,1,3,6,1,+4.6 };
 				error = InitCond(presigmapr, preleftlim, prerightlim);
@@ -267,9 +268,9 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 				model = &VBMicrolensing::BinaryLightCurveParallax;
 				nps = 9;
 				ReadOptions();
-				double presigmapr[] = { .1,0.5,.1,.1,0.3,.6,5.,0.03,0.03};
-				double preleftlim[] = { -4.0,-11.5,-3.,-12.56,-11.5,-6.9,-10.e100,-3.,-3. };
-				double prerightlim[] = { 3.0,11.5,3.,12.56,-2.5,7.6,10.e100,3.,3. };
+				double presigmapr[] = { .1,0.5,.1,.1,0.3,.6,5.,0.03,0.03 };
+				double preleftlim[] = { -4.0,-16.1,-3.,-12.56,-11.5,-6.9,-10.e100,-3.,-3. };
+				double prerightlim[] = { 3.0,16.1,3.,12.56,-2.5,7.6,10.e100,3.,3. };
 				error = InitCond(presigmapr, preleftlim, prerightlim);
 				pr[0] = log(pr[0]);
 				pr[1] = log(pr[1]);
@@ -285,8 +286,8 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 					nps = 12;
 					ReadOptions();
 					double presigmapr[] = { .1,0.5,.1,.1,0.3,.6,5.,0.03,0.03,0.01,0.01,0.01 };
-					double preleftlim[] = { -4.0,-11.5,-3.,-12.56,-11.5,-6.9,-10.e100,-3.,-3.,-1,-1,1.e-7 };
-					double prerightlim[] = { 3.0,11.5,3.,12.56,-2.5,7.6,10.e100,3.,3.,1,1,1 };
+					double preleftlim[] = { -4.0,-16.1,-3.,-12.56,-11.5,-6.9,-10.e100,-3.,-3.,-1,-1,1.e-7 };
+					double prerightlim[] = { 3.0,16.1,3.,12.56,-2.5,7.6,10.e100,3.,3.,1,1,1 };
 					error = InitCond(presigmapr, preleftlim, prerightlim);
 					pr[0] = log(pr[0]);
 					pr[1] = log(pr[1]);
@@ -302,8 +303,8 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 						nps = 14;
 						ReadOptions();
 						double presigmapr[] = { .1,0.5,.1,.1,0.3,.6,5.,0.03,0.03,0.1, 0.1 };
-						double preleftlim[] = { -4.0,-11.5,-3.,-12.56,-11.5,-6.9,-10.e100,-3.,-3.,-1,-1,1.e-7, -10,0.5001 };
-						double prerightlim[] = { 3.0,11.5,3.,12.56,-2.5,7.6,10.e100,3.,3.,1,1,1,10,10 };
+						double preleftlim[] = { -4.0,-16.1,-3.,-12.56,-11.5,-6.9,-10.e100,-3.,-3.,-1,-1,1.e-7, -10,0.5001 };
+						double prerightlim[] = { 3.0,16.1,3.,12.56,-2.5,7.6,10.e100,3.,3.,1,1,1,10,10 };
 						error = InitCond(presigmapr, preleftlim, prerightlim);
 						pr[0] = log(pr[0]);
 						pr[1] = log(pr[1]);
@@ -317,9 +318,9 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 						model = &VBMicrolensing::BinaryLightCurve;
 						nps = 7;
 						ReadOptions();
-						double presigmapr[] = { .1,0.5,.1,.1,0.3,.6,5.};
-						double preleftlim[] = { -4.0,-11.5,-3.,-12.56,-11.5,-6.9,-10.e100 };
-						double prerightlim[] = { 3.0,11.5,3.,12.56,-2.5,7.6,10.e100 };
+						double presigmapr[] = { .1,0.5,.1,.1,0.3,.6,5. };
+						double preleftlim[] = { -4.0,-16.1,-3.,-12.56,-11.5,-6.9,-10.e100 };
+						double prerightlim[] = { 3.0,16.1,3.,12.56,-2.5,7.6,10.e100 };
 						error = InitCond(presigmapr, preleftlim, prerightlim);
 						pr[0] = log(pr[0]);
 						pr[1] = log(pr[1]);
@@ -355,8 +356,8 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 				model = &VBMicrolensing::TripleLightCurve;
 				nps = 10;
 				ReadOptions();
-				double presigmapr[] = { .1,0.5,.1,.1,0.3,.6,5., 0.3, 0.5, 0.3};
-				double preleftlim[] = { -4.0,-11.5,-3.,-12.56,-11.5,-6.9,-10.e100,-4.0,-11.5,-12.56};
+				double presigmapr[] = { .1,0.5,.1,.1,0.3,.6,5., 0.3, 0.5, 0.3 };
+				double preleftlim[] = { -4.0,-11.5,-3.,-12.56,-11.5,-6.9,-10.e100,-4.0,-11.5,-12.56 };
 				double prerightlim[] = { 3.0,11.5,3.,12.56,-2.5,7.6,10.e100,3.0, 11.5, 12.56 };
 				error = InitCond(presigmapr, preleftlim, prerightlim);
 				pr[0] = log(pr[0]);
@@ -411,7 +412,7 @@ void LevMar::ReadOptions() {
 			constraints = (double*)malloc(sizeof(double) * consnumber);
 			consleft = (double*)malloc(sizeof(double) * consnumber);
 			consright = (double*)malloc(sizeof(double) * consnumber);
-			consvars = (double*)malloc(sizeof(double) * consnumber*(nps+1));
+			consvars = (double*)malloc(sizeof(double) * consnumber * (nps + 1));
 			printf("\n\n- Reading Constraints.ini");
 			f = fopen("Constraints.ini", "r");
 			int conscurrent = 0;
@@ -425,12 +426,12 @@ void LevMar::ReadOptions() {
 				else {
 					consindex[conscurrent] = -1;
 					strcpy(buffer, command);
-					int flaglog = 0,flaglog2 = 0;
+					int flaglog = 0, flaglog2 = 0;
 					buffer[4] = 0;
 					for (int i = 0; i < parnames[modnumber].size(); i++) {
 						if (strcmp(buffer, "log_") == 0) { // Log parameter
 							if (strcmp(parnames[modnumber][i].c_str(), &command[4]) == 0) {
-								consindex[conscurrent] = i;							
+								consindex[conscurrent] = i;
 								flaglog = 1;
 							}
 						}
@@ -696,7 +697,7 @@ void LevMar::ReadCurve() {
 
 }
 
-void LevMar::Run() {
+int LevMar::Run() {
 	FILE* f;
 	int il, k, ichi, flag, ilam, bumpnum, bumpcounter;
 	double minchi, bestchi, c1, c0, oldlambda, lambda, inclambda, fac, fac2;
@@ -802,8 +803,8 @@ void LevMar::Run() {
 						for (int i = 0; i < nps; i++) {
 							for (int j = 0; j < nps; j++) {
 								A[i * nps + j] = Curv[i * nps + j];
-								if (i == j) { 
-									A[i * nps + j] += lambda *Curv[i * nps + i]; 
+								if (i == j) {
+									A[i * nps + j] += lambda * Curv[i * nps + i];
 								}
 							}
 							B[i] = B0[i];
@@ -988,7 +989,7 @@ void LevMar::Run() {
 					fclose(f);
 
 
-					if (modelcode[0]=='L' && il == nlc - offsetdegeneracy - 1) {
+					if (modelcode[0] == 'L' && il == nlc - offsetdegeneracy - 1) {
 						// Find best model found so far and fit offset degeneracy model
 						scanbumper2 = bumperlist;
 						for (scanbumper = bumperlist; scanbumper; scanbumper = scanbumper->next) {
@@ -1000,10 +1001,14 @@ void LevMar::Run() {
 
 						if (sin(pr[3]) != 0) {
 							double s = exp(pr[0]);
-							double xc = pr[2] / sin(pr[3]);
+							double q = exp(pr[1]);
+							q /= 1 + q;
+							double xc = pr[2] / sin(pr[3]) + s * q;
 							double ac = 2 * s;
 							double b = 1 - s * s + ac * xc;
-							pr[0] = log((b + sqrt(ac * ac + b * b)) / ac);
+							double snew = (b + sqrt(ac * ac + b * b)) / ac;
+							pr[0] = log(snew);
+							pr[2] = (xc - snew * q) * sin(pr[3]);
 						}
 						scanbumper2 = stepchain;
 						while (scanbumper2) {
@@ -1080,6 +1085,7 @@ void LevMar::Run() {
 			error = 8;
 		}
 	}
+	return error;
 }
 
 double LevMar::ChiSquared(double* pr) {
@@ -1181,11 +1187,11 @@ void LevMar::Grad() {
 			prn[nps + 1 + i * 2] = (sumf[i] * sumy[i] - sumsigma[i] * sumfy[i]) / p1;
 
 			if (prn[nps + 1 + i * 2] < 0)  prn[nps + 1 + i * 2] = 0;
-			dFdp[(1 + 2 * i) * nps + j] = (prn[nps + i * 2] + prn[nps + 1 + i * 2] - pr[nps + i * 2] - pr[nps + 1 + i * 2]) / inc;  // error on baseline FB+FS
+			dFdp[(1 + 2 * i) * nps + j] = -1.08574 * ((prn[nps + i * 2] + prn[nps + 1 + i * 2]) / (pr[nps + i * 2] + pr[nps + 1 + i * 2]) - 1) / inc;  // error on baseline -2.5log(FB+FS)/log(10) expanded to first order
 			dFdp[(2 * i) * nps + j] = (prn[nps + i * 2] / prn[nps + 1 + i * 2] - pr[nps + i * 2] / pr[nps + 1 + i * 2]) / inc;    // error on blending FB/FS
 		}
 		for (int icons = 0; icons < consnumber; icons++) { // Gradient of constraints
-			consvars[icons + (j+1) * consnumber] = ComputeConstraint(prn, icons);
+			consvars[icons + (j + 1) * consnumber] = ComputeConstraint(prn, icons);
 			p1 = (consvars[icons] - constraints[icons]);
 			consvars[icons + (j + 1) * consnumber] = (consvars[icons + (j + 1) * consnumber] - consvars[icons]) / (((p1 > 0) ? consright[icons] : consleft[icons]) * inc);
 		}
@@ -1204,7 +1210,7 @@ void LevMar::Grad() {
 			}
 			// Constraints in curvature
 			for (int icons = 0; icons < consnumber; icons++) {
-				Curv[i * nps + j] += consvars[icons + (i+1) * consnumber]* consvars[icons + (j+1) * consnumber];
+				Curv[i * nps + j] += consvars[icons + (i + 1) * consnumber] * consvars[icons + (j + 1) * consnumber];
 			}
 		}
 	}
@@ -1219,12 +1225,12 @@ void LevMar::Grad() {
 		for (int icons = 0; icons < consnumber; icons++) {
 			p1 = (consvars[icons] - constraints[icons]);
 			p1 /= (p1 > 0) ? consright[icons] : consleft[icons];
-			B0[i] -= p1 * consvars[icons + (i+1)*consnumber];
+			B0[i] -= p1 * consvars[icons + (i + 1) * consnumber];
 		}
 	}
 }
 
-inline double LevMar::ComputeConstraint(double *pr, int ic) {
+inline double LevMar::ComputeConstraint(double* pr, int ic) {
 	int i = consindex[ic];
 	if (i < 10000) {
 		return pr[i];
@@ -1233,7 +1239,7 @@ inline double LevMar::ComputeConstraint(double *pr, int ic) {
 		return pr[nps + (i - 10000) * 2] / pr[nps + (i - 10000) * 2 + 1];
 	}
 	if (i == 30000) {
-		int posN=-1, posE=-1;
+		int posN = -1, posE = -1;
 		for (int i = 0; i < nps; i++) {
 			if (strcmp(parnames[modnumber][i].c_str(), "piN") == 0) posN = i;
 			if (strcmp(parnames[modnumber][i].c_str(), "piE") == 0) posE = i;
@@ -1246,9 +1252,9 @@ inline double LevMar::ComputeConstraint(double *pr, int ic) {
 			if (strcmp(parnames[modnumber][i].c_str(), "tE") == 0) postE = i;
 			if (strcmp(parnames[modnumber][i].c_str(), "rho") == 0) posrho = i;
 		}
-		return exp(pr[postE]+pr[posrho]);
+		return exp(pr[postE] + pr[posrho]);
 	}
-	
+
 	return 0;
 }
 

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

@@ -35,8 +35,8 @@ class LevMar {
 	double* t, * y, * w, * delta, * maxdelta, * Curv, * A, * B, * B0, * Cov, * fb, ** Gr, * dFdp, * errs;
 	double* pr, * prn, * sumy, * sumy2, * sumsigma, * sumfy, * sumf, * sumf2, * limbdarks;
 
-	int consnumber, *consindex;
-	double* constraints, * consleft, * consright, *consvars;
+	int consnumber, * consindex;
+	double* constraints, * consleft, * consright, * consvars;
 	int modnumber;
 
 	double Tol;
@@ -55,11 +55,11 @@ public:
 	int InitCond(double* presigmapr, double* preleftlim, double* prerightlim);
 	void ReadCurve();
 	void ReadOptions();
-	void Run();
+	int Run();
 	double ChiSquared(double*);
 	void Grad();
 	void Covariance();
-	double ComputeConstraint(double *pr, int i);
+	double ComputeConstraint(double* pr, int i);
 
 	void PrintOutPS(double*);
 	void PrintOutPX(double*);
@@ -88,4 +88,4 @@ public:
 double Determinant(double*, int);
 void Inverse(double*, double*, int);
 
-#endif
+#endif

{rtmodel-2.3 → rtmodel-2.4}/RTModel/lib/ModelSelector.cpp

@@ -35,6 +35,7 @@ int main(int argc, char* argv[]) {
 	bumper* bumperlist = 0, * scanbumper, * scanbumper2;
 
 
+	setbuf(stdout, nullptr);
 	printf("******************************************\n");
 	printf("**********     Model selector    *********\n");
 	printf("******************************************\n\n\n");

{rtmodel-2.3 → rtmodel-2.4}/RTModel/lib/Reader.cpp

@@ -69,6 +69,7 @@ int main(int argc, char *argv[])
 	
 // Directory preliminaries. Reads event name from arguments.
 
+	setbuf(stdout, nullptr);
 	printf("******************************************\n");
 	printf("*************      Reader      **********\n");
 	printf("******************************************\n\n");

{rtmodel-2.3 → rtmodel-2.4}/RTModel/plotmodel/__init__.py

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