Fix pyLINT

ebachelet · Aug 10, 2024 · 1d036ef · 1d036ef
1 parent 5f631e8
commit 1d036ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/pyLIMA/pyLIMASS/pyLIMASS.py b/pyLIMA/pyLIMASS/pyLIMASS.py
@@ -718,7 +718,6 @@ def priors_proba(self, observed):
                 #print(ind,self.bounds[ind],params[ind],prior.pdf(params[ind]))
                 score_prior += np.log(prior.pdf(params[ind]))
 
-<<<<<<< HEAD
         if self.extra_priors is not None:
 
             for extra_prior in self.extra_priors:
@@ -733,10 +732,6 @@ def priors_proba(self, observed):
 
                     #ln_likelihood = -np.inf
                     score_prior = -np.inf
-=======
-
-
->>>>>>> 4552e71107954f912301f443ee3ad51f4557f7a1
 
         return score_prior
 

diff --git a/pyLIMA/tests/test_simulations.py b/pyLIMA/tests/test_simulations.py
@@ -50,9 +50,9 @@ def test_simulate_a_telescope():
     assert telo.lightcurve_flux is not None
     assert telo.lightcurve_magnitude is not None
     assert telo.astrometry is not None
-    assert telo.Earth_positions is not {}
-    assert telo.Earth_speeds is not {}
-    assert telo.spacecraft_positions is not {}
+    assert telo.Earth_positions != {}
+    assert telo.Earth_speeds != {}
+    assert telo.spacecraft_positions != {}
 
 
 def test_time_simulation():