tqdm added to requirements.txt

PynPoint · Oct 1, 2019 · e2f83ae · e2f83ae
1 parent 2c710c4
commit e2f83ae
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/pynpoint/processing/fluxposition.py b/pynpoint/processing/fluxposition.py
@@ -823,7 +823,7 @@ def run(self) -> None:
         initial[:, 1] = self.m_param[1] + np.random.normal(0, self.m_sigma[1], self.m_nwalkers)
         initial[:, 2] = self.m_param[2] + np.random.normal(0, self.m_sigma[2], self.m_nwalkers)
 
-        print('Sampling the posteriors with MCMC...')
+        print('Sampling the posterior distributions with MCMC...')
 
         with Pool(processes=cpu) as pool:
             sampler = emcee.EnsembleSampler(nwalkers=self.m_nwalkers,

diff --git a/pynpoint/processing/frameselection.py b/pynpoint/processing/frameselection.py
@@ -359,8 +359,10 @@ def run(self) -> None:
             if memory == 0 or memory >= nimages:
                 memory = nimages
 
+            start_time = time.time()
+
             for i, _ in enumerate(frames[:-1]):
-                progress(i, nimages, 'Writing selected data...', start_time)
+                progress(i, frames[:-1], 'Writing selected data...', start_time)
 
                 index_del = np.where(np.logical_and(indices >= frames[i],
                                                     indices < frames[i+1]))

diff --git a/pynpoint/processing/pcabackground.py b/pynpoint/processing/pcabackground.py
@@ -711,9 +711,6 @@ def _admin_end(count, n_dither):
             elif self.m_combine == 'pca':
                 tags.append(self.m_image_in_tag+'_dither_pca_res'+str(count+1))
 
-            if self.m_crop or self.m_prepare or self.m_pca_background:
-                print('')
-
         n_dither, star_pos = self._initialize()
         tags = []
 

diff --git a/requirements.txt b/requirements.txt
@@ -10,4 +10,5 @@ scikit-image ~= 0.15
 scikit-learn ~= 0.21
 scipy ~= 1.3
 statsmodels ~= 0.10
+tqdm ~= 4.36
 typeguard ~= 2.3
diff --git a/tests/test_processing/test_fluxposition.py b/tests/test_processing/test_fluxposition.py
@@ -298,8 +298,8 @@ def test_simplex_minimization_reference(self):
 
     def test_mcmc_sampling(self):
 
-        with h5py.File(self.test_dir+'PynPoint_database.hdf5', 'a') as hdf_file:
-            hdf_file['config'].attrs['CPU'] = 4
+        # with h5py.File(self.test_dir+'PynPoint_database.hdf5', 'a') as hdf_file:
+        #     hdf_file['config'].attrs['CPU'] = 4
 
         self.pipeline.set_attribute('adi', 'PARANG', np.arange(0., 200., 10.), static=False)