PYROS-IRAP / pyros

Commit dbacdf02aee7f6eeddec7f555a7cd253bf364949

Authored by Etienne Pallier
1 parent 1aed430d
Exists in master and in 1 other branch dev

commentaires

Showing 5 changed files with 2 additions and 4 deletions   Show diff stats
Inline Side-by-side
install/install.json
  Diff comments   View file @dbacdf0
@@ -12,8 +12,6 @@ @@ -12,8 +12,6 @@
12 "update" 12 "update"
13 ], 13 ],
14 "normal": [ 14 "normal": [
15 - "pip install --upgrade pip",  
16 - "pip install virtualenv --upgrade"  
17 ], 15 ],
18 "private": [ 16 "private": [
19 "create", "pyros" 17 "create", "pyros"
install/install.py
  Diff comments   View file @dbacdf0
@@ -336,8 +336,6 @@ class Config: @@ -336,8 +336,6 @@ class Config:
336 "env_bin": [], 336 "env_bin": [],
337 "env_pip": [], 337 "env_pip": [],
338 "normal": [ 338 "normal": [
339 - "pip install --upgrade pip",  
340 - "pip install virtualenv --upgrade"  
341 ], 339 ],
342 "special": ["create"], 340 "special": ["create"],
343 "link": ["update"] 341 "link": ["update"]
src/analyzer/analyzer
View file @dbacdf0
No preview for this file type
src/observation_manager/calibrator
View file @dbacdf0
No preview for this file type
src/observation_manager/tasks.py
  Diff comments   View file @dbacdf0
@@ -109,6 +109,7 @@ class execute_plan_vis(execute_plan): @@ -109,6 +109,7 @@ class execute_plan_vis(execute_plan):
109 self.tel.do("GOTO " + str(self.plan.position)) 109 self.tel.do("GOTO " + str(self.plan.position))
110 self.vis_camera.do("CAPTURE "+self.dir_name+" "+str(self.plan.nb_images)+" "+str(self.plan.duration)) 110 self.vis_camera.do("CAPTURE "+self.dir_name+" "+str(self.plan.nb_images)+" "+str(self.plan.duration))
111 self.log("Sleeping for " + str(int(self.duration))) 111 self.log("Sleeping for " + str(int(self.duration)))
  112 + #TODO: faire un boucle infinie de recup image + lancement calib pour chaque image des que disponible
112 time.sleep(int(self.duration)) 113 time.sleep(int(self.duration))
113 self.launchCalibration() 114 self.launchCalibration()
114 return 0 115 return 0
@@ -132,6 +133,7 @@ class execute_plan_nir(execute_plan): @@ -132,6 +133,7 @@ class execute_plan_nir(execute_plan):
132 self.tel.do("GOTO " + str(self.plan.position)) 133 self.tel.do("GOTO " + str(self.plan.position))
133 self.nir_camera.do("CAPTURE "+self.dir_name+" "+str(self.plan.nb_images)+" "+str(self.plan.duration)) 134 self.nir_camera.do("CAPTURE "+self.dir_name+" "+str(self.plan.nb_images)+" "+str(self.plan.duration))
134 self.log("Sleeping for " + str(int(self.duration))) 135 self.log("Sleeping for " + str(int(self.duration)))
  136 + #TODO: faire un boucle infinie de recup image + lancement calib pour chaque image des que disponible
135 time.sleep(int(self.duration)) 137 time.sleep(int(self.duration))
136 self.launchCalibration() 138 self.launchCalibration()
137 return 0 139 return 0