diff --git a/install/install.json b/install/install.json index aef6c60..b054d89 100644 --- a/install/install.json +++ b/install/install.json @@ -12,8 +12,6 @@ "update" ], "normal": [ - "pip install --upgrade pip", - "pip install virtualenv --upgrade" ], "private": [ "create", "pyros" diff --git a/install/install.py b/install/install.py index ac92408..fed53c9 100644 --- a/install/install.py +++ b/install/install.py @@ -336,8 +336,6 @@ class Config: "env_bin": [], "env_pip": [], "normal": [ - "pip install --upgrade pip", - "pip install virtualenv --upgrade" ], "special": ["create"], "link": ["update"] diff --git a/src/analyzer/analyzer b/src/analyzer/analyzer index c10ca1a..363dab1 100755 Binary files a/src/analyzer/analyzer and b/src/analyzer/analyzer differ diff --git a/src/observation_manager/calibrator b/src/observation_manager/calibrator index 482a682..346e468 100755 Binary files a/src/observation_manager/calibrator and b/src/observation_manager/calibrator differ diff --git a/src/observation_manager/tasks.py b/src/observation_manager/tasks.py index 4dde208..9beb204 100644 --- a/src/observation_manager/tasks.py +++ b/src/observation_manager/tasks.py @@ -109,6 +109,7 @@ class execute_plan_vis(execute_plan): self.tel.do("GOTO " + str(self.plan.position)) self.vis_camera.do("CAPTURE "+self.dir_name+" "+str(self.plan.nb_images)+" "+str(self.plan.duration)) self.log("Sleeping for " + str(int(self.duration))) + #TODO: faire un boucle infinie de recup image + lancement calib pour chaque image des que disponible time.sleep(int(self.duration)) self.launchCalibration() return 0 @@ -132,6 +133,7 @@ class execute_plan_nir(execute_plan): self.tel.do("GOTO " + str(self.plan.position)) self.nir_camera.do("CAPTURE "+self.dir_name+" "+str(self.plan.nb_images)+" "+str(self.plan.duration)) self.log("Sleeping for " + str(int(self.duration))) + #TODO: faire un boucle infinie de recup image + lancement calib pour chaque image des que disponible time.sleep(int(self.duration)) self.launchCalibration() return 0 -- libgit2 0.21.2