RTModel 2.2__tar.gz → 2.3__tar.gz

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

@@ -0,0 +1,48 @@
+name: Build
+
+on: [push]
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # macos-13 is an intel runner, macos-14 is apple silicon
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.22.0
+        # env:
+        #   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.3}/.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.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RTModel
-Version: 2.2
+Version: 2.3
 Summary: RTModel is a tool for microlensing event interpretation.
 Keywords: Microlensing analysis and fitting
 Author-Email: Valerio Bozza <valboz@sa.infn.it>
@@ -10,7 +10,7 @@ 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-Python: <4,>=3.7
 Requires-Dist: numpy
 Requires-Dist: pytest
 Requires-Dist: matplotlib
@@ -40,7 +40,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.3}/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.3}/RTModel/RTModel.py

@@ -142,8 +142,9 @@ class RTModel:
                             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):
+    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 +161,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')
@@ -179,6 +181,7 @@ class RTModel:
             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')
@@ -435,6 +438,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.3}/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.3}/RTModel/lib/Finalizer.cpp

@@ -285,69 +285,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.3}/RTModel/lib/LevMarFit.cpp

@@ -18,7 +18,8 @@
 using namespace std;
 using namespace std::filesystem;
 
-int nlc = 5; // Number of models to be calculated from the same initial condition using the bumper method
+int nlc = 6; // Number of models to be calculated from the same initial condition using the bumper method
+int offsetdegeneracy = 3; // Number of models to be calculated with offset degeneracy
 int maxsteps = 50; // Maximum number of steps in each fit
 double maxtime = 1.e100; // 600.0; // Maximum time in seconds for total execution (no longer controlled within LevMar)
 double bumperpower = 2.0; // Repulsion factor of bumpers
@@ -193,7 +194,7 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 				model = &VBMicrolensing::ESPLLightCurveParallax;
 				nps = 6;
 				ReadOptions();
-				double presigmapr[] = { .5,.5,5.,4.6,1,1 };
+				double presigmapr[] = { .5,1.0,5.,2.3,0.1,0.1 };
 				double preleftlim[] = { -13.,-6.9,-10.e100,-11.5,-10.,-10. };
 				double prerightlim[] = { .7,6.9,10.e100,0.0,10.,10. };
 				error = InitCond(presigmapr, preleftlim, prerightlim);
@@ -207,7 +208,7 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 				model = &VBMicrolensing::ESPLLightCurve;
 				nps = 4;
 				ReadOptions();
-				double presigmapr[] = { .5,.5,5.,4.6 };
+				double presigmapr[] = { 1.15,1.0,5.,2.3 };
 				double preleftlim[] = { -13.,-6.9,-10.e100,-11.5 };
 				double prerightlim[] = { .7,6.9,10.e100,0.0 };
 				error = InitCond(presigmapr, preleftlim, prerightlim);
@@ -229,7 +230,7 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 				model = &VBMicrolensing::BinSourceSingleLensXallarap;
 				nps = 10;
 				ReadOptions();
-				double presigmapr[] = { 1,1,1,15,3,3,1,3,6,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);
@@ -244,7 +245,7 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 				model = &VBMicrolensing::BinSourceExtLightCurve;
 				nps = 7;
 				ReadOptions();
-				double presigmapr[] = { .1,.4,1,1,1,1,4.6 };
+				double presigmapr[] = { 1.0,.5,0.5,0.5,1,1,0.5 };
 				double preleftlim[] = { -6.9,-11.5,0.,0.,-10.e100,-10.e100,-11.5 };
 				double prerightlim[] = { 6.9,11.5,3.,3.,10.e100,10.e100,0.0 };
 				error = InitCond(presigmapr, preleftlim, prerightlim);
@@ -266,7 +267,7 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 				model = &VBMicrolensing::BinaryLightCurveParallax;
 				nps = 9;
 				ReadOptions();
-				double presigmapr[] = { .1,.4,.1,.1,4.6,.1,1.,1.,1. };
+				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. };
 				error = InitCond(presigmapr, preleftlim, prerightlim);
@@ -283,7 +284,7 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 					model = &VBMicrolensing::BinaryLightCurveOrbital;
 					nps = 12;
 					ReadOptions();
-					double presigmapr[] = { 1.,2.,1.,5.,15.6,2.,10.,3.,3.,1.,1.,3. };
+					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 };
 					error = InitCond(presigmapr, preleftlim, prerightlim);
@@ -300,7 +301,7 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 						model = &VBMicrolensing::BinaryLightCurveKepler;
 						nps = 14;
 						ReadOptions();
-						double presigmapr[] = { 1.,2.,1.,5.,15.6,2.,10.,3.,3.,1.,1.,3., 3., 3. };
+						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 };
 						error = InitCond(presigmapr, preleftlim, prerightlim);
@@ -316,7 +317,7 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 						model = &VBMicrolensing::BinaryLightCurve;
 						nps = 7;
 						ReadOptions();
-						double presigmapr[] = { .1,.4,.1,.1,4.6,.1,1. };
+						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 };
 						error = InitCond(presigmapr, preleftlim, prerightlim);
@@ -354,7 +355,7 @@ void LevMar::ReadFiles(int argc, char* argv[]) {
 				model = &VBMicrolensing::TripleLightCurve;
 				nps = 10;
 				ReadOptions();
-				double presigmapr[] = { .1,.4,.1,.1,4.6,.1,1.,.1,.4,.1};
+				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);
@@ -503,6 +504,9 @@ void LevMar::ReadOptions() {
 				if (strcmp(command, "nfits") == 0) {
 					sscanf(value, "%d", &nlc);
 				}
+				if (strcmp(command, "offsetdegeneracy") == 0) {
+					sscanf(value, "%d", &offsetdegeneracy);
+				}
 				if (strcmp(command, "maxsteps") == 0) {
 					sscanf(value, "%d", &maxsteps);
 				}
@@ -925,7 +929,7 @@ void LevMar::Run() {
 
 				if (ichi < 4) {
 					// Final chi square of this model
-					c0 = c1;//ChiSquared(pr);
+					c0 = ChiSquared(pr);
 					printf("\nFinal chi square = %lf\n", c0);
 
 					//Check if this is the best model with this initial condition
@@ -937,50 +941,13 @@ void LevMar::Run() {
 					// Add a new bumper at the position of this model
 					scanbumper = bumperlist;
 					bumperlist = new bumper(pr, nps);
+					bumperlist->Amp = c0;
 					bumperlist->next = scanbumper;
 					// Calculate covariance matrix
 					Grad();
 					Covariance();
 					bumperlist->SetCurvature(Curv, np / c0);
 
-
-					// Saving the steps done to this model
-		//			sprintf(filename, "stepchain%d.dat", il);
-					//f = fopen(filename, "w");
-					//for (scanbumper = stepchain; scanbumper; scanbumper = scanbumper->next) {
-					//	fprintf(f, "%.16le", scanbumper->p0[0]);
-					//	for (int j = 1; j < nps; j++) {
-					//		fprintf(f, " %.16le", scanbumper->p0[j]);
-					//	}
-					//	fprintf(f, "\n");
-					//}
-					//fclose(f);
-
-					// Finding the last step outside any bumper
-					k = 1;
-					for (scanbumper = stepchain; scanbumper && (scanbumper->next); scanbumper = scanbumper->next) {
-						k++;
-						fac = 1.e100;
-						for (scanbumper2 = bumperlist; scanbumper2; scanbumper2 = scanbumper2->next) {
-							fac2 = scanbumper2->distance(scanbumper->next->p0);
-							if (fac2 < fac) fac = fac2;
-						}
-						printf("\n%d %lf", k, fac);
-						if (fac < 1.) {
-							laststep = scanbumper;
-							k--;
-							scanbumper2 = scanbumper->next;
-							while (scanbumper2) {
-								scanbumper = scanbumper2->next;
-								delete scanbumper2;
-								scanbumper2 = scanbumper;
-							}
-							laststep->next = 0;
-							scanbumper = laststep;
-						}
-					}
-
-
 					// Check if the model makes sense, otherwise set negative chi square for 
 					// processing by subsequent programs.
 					if ((c0 > 2) && (c0 < 1.e100) && flagblending < np / 2) {
@@ -1021,6 +988,58 @@ void LevMar::Run() {
 					fclose(f);
 
 
+					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) {
+							if (scanbumper->Amp < scanbumper2->Amp) scanbumper2 = scanbumper;
+						}
+						for (int i = 0; i < nps; i++) {
+							pr[i] = scanbumper2->p0[i];
+						}
+
+						if (sin(pr[3]) != 0) {
+							double s = exp(pr[0]);
+							double xc = pr[2] / sin(pr[3]);
+							double ac = 2 * s;
+							double b = 1 - s * s + ac * xc;
+							pr[0] = log((b + sqrt(ac * ac + b * b)) / ac);
+						}
+						scanbumper2 = stepchain;
+						while (scanbumper2) {
+							scanbumper = scanbumper2->next;
+							delete scanbumper2;
+							scanbumper2 = scanbumper;
+						}
+
+						stepchain = laststep = new bumper(pr, nps);
+					}
+					else {
+
+						// Finding the last step outside any bumper
+						k = 1;
+						for (scanbumper = stepchain; scanbumper && (scanbumper->next); scanbumper = scanbumper->next) {
+							k++;
+							fac = 1.e100;
+							for (scanbumper2 = bumperlist; scanbumper2; scanbumper2 = scanbumper2->next) {
+								fac2 = scanbumper2->distance(scanbumper->next->p0);
+								if (fac2 < fac) fac = fac2;
+							}
+							printf("\n%d %lf", k, fac);
+							if (fac < 1.) {
+								laststep = scanbumper;
+								k--;
+								scanbumper2 = scanbumper->next;
+								while (scanbumper2) {
+									scanbumper = scanbumper2->next;
+									delete scanbumper2;
+									scanbumper2 = scanbumper;
+								}
+								laststep->next = 0;
+								scanbumper = laststep;
+							}
+						}
+					}
 					// Updating time count
 					//printf("\npartial time=%lf secs\n",(Environment::TickCount-tm)/1000.0);
 					//printf("total time = %lf mins\n",(Environment::TickCount-tim0)/60000.0);

rtmodel-2.3/RTModel/lib/LevMarFit.h

@@ -0,0 +1,91 @@
+// LevMarFit.h
+// Definition of the LevMar and bumper classes for Levenberg-Marquardt fitting
+
+#include <cstdio>
+#include "bumper.h"
+#include <regex>
+#include <filesystem>
+
+using namespace std;
+using namespace std::filesystem;
+
+#ifndef _LevMarFit
+#define _LevMarFit
+#define __unmanaged
+
+#include <VBMicrolensingLibrary.h>
+
+class LevMar {
+
+	VBMicrolensing* VBM;
+
+	char eventname[512], filename[30], filnum[10], outdir[30], satellitedir[256];
+	char modelcode[16];
+	int error;
+	int flagblending;
+	path exedir;
+
+	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;
+	double* pr, * prn, * sumy, * sumy2, * sumsigma, * sumfy, * sumf, * sumf2, * limbdarks;
+
+	int consnumber, *consindex;
+	double* constraints, * consleft, * consright, *consvars;
+	int modnumber;
+
+	double Tol;
+
+	void (LevMar::* PrintOut)(double*);
+	void (LevMar::* PrintFile)(FILE*, double, bool);
+
+	bumper* stepchain, * bumperlist, * laststep;
+
+
+public:
+	LevMar(int, char**);
+	~LevMar();
+
+	void ReadFiles(int, char**);
+	int InitCond(double* presigmapr, double* preleftlim, double* prerightlim);
+	void ReadCurve();
+	void ReadOptions();
+	void Run();
+	double ChiSquared(double*);
+	void Grad();
+	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