Img pipeline (#63)

* Image_pipeline.md formatting and images * Update Image_pipeline.md Added link to intrinsic calibration * typos and images
Addalin · Jan 8, 2020 · 5468286 · 5468286
1 parent 79ffa60
commit 5468286
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 14 deletions.
diff --git a/CameraNetwork/mdp/__init__.py b/CameraNetwork/mdp/__init__.py
@@ -46,7 +46,7 @@
     process offering exactly one service in request/reply fashion.
 
   client
-    independant process using a service in request/reply fashion.
+    independent process using a service in request/reply fashion.
 
   broker
     process routing messages from a client to a worker and back.

diff --git a/CameraNetwork/mdp/broker.py b/CameraNetwork/mdp/broker.py
@@ -81,7 +81,7 @@ class MDPBroker(object):
     requested service.
 
     This base class defines the overall functionality and the API. Subclasses are
-    ment to implement additional features (like logging).
+    meant to implement additional features (like logging).
 
     The broker uses ZMQ ROUTER sockets to deal with clients and workers. These sockets
     are wrapped in pyzmq streams to fit well into IOLoop.
@@ -628,7 +628,7 @@ class WorkerRep(object):
     """Helper class to represent a worker in the broker.
 
     Instances of this class are used to track the state of the attached worker
-    and carry the timers for incomming and outgoing heartbeats.
+    and carry the timers for incoming and outgoing heartbeats.
 
     :param proto:    the worker protocol id.
     :type wid:       str
@@ -655,7 +655,7 @@ def __init__(self, proto, wid, service, stream):
     def send_uniqueid(self):
         """Called on W_READY from worker.
 
-        Sends unique id tu worker.
+        Sends unique id to worker.
         """
 
         logging.debug('Broker to Worker {} sending unique id: {}'.format(

diff --git a/CameraNetwork/mdp/worker.py b/CameraNetwork/mdp/worker.py
@@ -277,7 +277,7 @@ def _on_message(self, msg):
             self.curr_liveness = 0
         elif msg_type == W_READY:
             #
-            # The message contains the unique id attahced to the worker.
+            # The message contains the unique id attached to the worker.
             #
             if len(msg) > 0:
                 #

diff --git a/Image_pipeline.md b/Image_pipeline.md
@@ -95,6 +95,7 @@ To apply the extrinsic calibration from the GUI:
  `extrinsic calibrate` 
   - Also saves the extrinsic_data.npy in camera folder.
 
+
 To save all cameras extrinsic calibration: 
 
   - `Arrays` --> `Save Extrinsic`
@@ -105,19 +106,22 @@ Graphical Result:
 
 ![extrinsic](docs/source/images/snapshot_extrinsic.png)
 
+
 ### 3. Radiometric calibration:
 To perform radiometric calibration with a sunphotometer, 
 the camera should be close to the sunphotometer, and the measurements should be done in a clear sky day. 
 
 To get the sunphotometer measurements: 
+
 1. Download files from NASA's [AERONET site](https://aeronet.gsfc.nasa.gov/cgi-bin/webtool_inv_v3?stage=3&region=Middle_East&state=Israel&site=Technion_Haifa_IL&place_code=10&if_polarized=0).
 
     - All the current files can be found under `.../data/aeronet`. 
 
     - Some manipulation, such as deleting first rows, might be needed for new data. 
 
     - The meaning of numbers and measurements can be found [here](https://aeronet.gsfc.nasa.gov/new_web/units.html). 
-        - Specifically: irradiance sunphotometer units are [uW/cm^2/sr/nm].  (\\TODO : check how to write this in a letex way...)
+
+        - Specifically: irradiance sunphotometer units are ![formula](https://render.githubusercontent.com/render/math?math=uW/cm^2/sr/nm).
 
 2. The function [handle_radiometric()](https://github.com/Addalin/cameranetwork/blob/3552f2453f3d42942ae6f90c2245b9ccb7c3dbce/CameraNetwork/controller.py#L1095-L1178):
 
@@ -131,7 +135,8 @@ To get the sunphotometer measurements:
 
 For example:
 
-![Radiometric](docs/source/images/radiometric_calibration.png)
+[Radiometric](docs/source/images/radiometric_calibration.png)
+
 
 ##### Questions regarding radiometric calibration:  
 1. What are the final conversion units?

diff --git a/data/aeronet/2016_10/161001_161031_Technion_Haifa_IL.alm b/data/aeronet/2016_10/161001_161031_Technion_Haifa_IL.alm
@@ -1,6 +1,3 @@
-These data are raw data with calibration applied.
-Location=Technion_Haifa_IL,long=35.025,lat=32.776,elev=230,Nmeas=60,PI=Yoav_Y._Schechner_and_Dietrich_Althausen,Email=yoav@ee.technion.ac.il_and_dietrich@tropos.de
-Almucantars,All Points,UNITS can be found at,,, http://aeronet.gsfc.nasa.gov/data_menu.html
 Date(dd-mm-yyyy),Time(hh:mm:ss),Wavelength(um),SolarZenithAngle(degrees),0.000000,-6.000000,-5.000000,-4.000000,-3.500000,-3.000000,-2.500000,-2.000000,2.000000,2.500000,3.000000,3.500000,4.000000,5.000000,6.000000,6.000000,7.000000,8.000000,10.000000,12.000000,14.000000,16.000000,18.000000,20.000000,25.000000,30.000000,35.000000,40.000000,45.000000,50.000000,60.000000,70.000000,80.000000,90.000000,100.000000,120.000000,140.000000,160.000000,180.000000,-180.000000,-160.000000,-140.000000,-120.000000,-100.000000,-90.000000,-80.000000,-70.000000,-60.000000,-50.000000,-45.000000,-40.000000,-35.000000,-30.000000,-25.000000,-20.000000,-18.000000,-16.000000,-14.000000,-12.000000,-10.000000,-8.000000,-7.000000,-6.000000,-6.000000,-5.000000,-4.000000,-3.500000,-3.000000,-2.500000,-2.000000,2.000000,2.500000,3.000000,3.500000,4.000000,5.000000,6.000000
 01:10:2016,04:49:59,1.020200,75.043157,-100,19.089889,26.014818,37.202538,45.492234,56.578859,-100.000000,-100.000000,-100.000000,-100.000000,57.825684,46.469474,38.044986,26.537136,19.393171,19.468594,14.723387,11.586547,7.789540,5.731251,4.509734,3.740241,3.199914,2.815167,2.163411,1.766050,1.465401,1.236235,1.059630,0.929278,0.719034,0.412078,0.294342,0.021024,0.027332,0.365825,0.401566,0.443615,0.460434,0.456229,0.433103,0.395259,0.365825,0.393156,0.433103,0.496176,0.594991,0.750571,0.962918,1.105883,1.276181,1.494835,1.782869,2.180230,2.821474,3.208323,3.736036,4.499222,5.684998,7.709647,11.443581,14.538372,19.146921,19.089889,26.014818,37.202538,45.492234,56.578859,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000
 01:10:2016,04:51:16,1.641700,74.782756,-100,5.617560,7.206432,9.523260,11.068920,12.946980,-100.000000,-100.000000,-100.000000,-100.000000,13.259436,11.261712,9.652896,7.299504,5.674068,5.694012,4.524795,3.670527,2.541198,1.869750,1.442616,1.155921,0.954819,0.806901,0.574221,0.427134,0.334893,0.270906,0.221877,0.183651,0.132960,0.091410,0.221046,0.004986,0.007479,0.051522,0.054015,0.058170,0.060663,0.059001,0.056508,0.053184,0.053184,0.059001,0.068142,0.081438,0.099720,0.140439,0.191130,0.226032,0.275061,0.338217,0.429627,0.566742,0.806901,0.953157,1.155921,1.449264,1.888032,2.565297,3.671358,4.503189,5.641659,5.617560,7.206432,9.523260,11.068920,12.946980,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000

diff --git a/data/aeronet/2017_05/170501_170531_Technion_Haifa_IL.alm b/data/aeronet/2017_05/170501_170531_Technion_Haifa_IL.alm
@@ -1,6 +1,3 @@
-These data are raw data with calibration applied.
-Location=Technion_Haifa_IL,long=35.025,lat=32.776,elev=230,Nmeas=48,PI=Yoav_Y._Schechner_and_Dietrich_Althausen,Email=yoav@ee.technion.ac.il_and_dietrich@tropos.de
-Almucantars,All Points,UNITS can be found at,,, http://aeronet.gsfc.nasa.gov/data_menu.html
 Date(dd-mm-yyyy),Time(hh:mm:ss),Wavelength(um),SolarZenithAngle(degrees),0.000000,-6.000000,-5.000000,-4.000000,-3.500000,-3.000000,-2.500000,-2.000000,2.000000,2.500000,3.000000,3.500000,4.000000,5.000000,6.000000,6.000000,7.000000,8.000000,10.000000,12.000000,14.000000,16.000000,18.000000,20.000000,25.000000,30.000000,35.000000,40.000000,45.000000,50.000000,60.000000,70.000000,80.000000,90.000000,100.000000,120.000000,140.000000,160.000000,180.000000,-180.000000,-160.000000,-140.000000,-120.000000,-100.000000,-90.000000,-80.000000,-70.000000,-60.000000,-50.000000,-45.000000,-40.000000,-35.000000,-30.000000,-25.000000,-20.000000,-18.000000,-16.000000,-14.000000,-12.000000,-10.000000,-8.000000,-7.000000,-6.000000,-6.000000,-5.000000,-4.000000,-3.500000,-3.000000,-2.500000,-2.000000,2.000000,2.500000,3.000000,3.500000,4.000000,5.000000,6.000000
 01:05:2017,04:10:41,1.020200,74.869557,-100,64.666408,77.606518,95.668044,109.000796,128.052462,-100.000000,-100.000000,-100.000000,-100.000000,132.252023,118.236415,106.815658,90.546628,78.408873,-100.000000,67.545013,59.395854,44.204238,35.967820,30.602443,26.056451,23.049201,20.912414,17.662541,13.738005,10.924427,9.260118,8.383269,5.599487,0.097901,0.095772,0.095772,0.114927,1.619616,1.413174,1.389763,1.464252,1.853726,1.787750,1.843085,2.204891,1.887779,2.055912,2.358127,2.698651,3.145588,3.916023,5.454765,6.408231,7.610706,9.751749,12.920748,16.777179,21.240169,23.806866,26.441669,30.383231,36.176391,42.884709,50.586930,56.258779,64.814438,64.666408,77.606518,95.668044,109.000796,128.052462,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000
 01:05:2017,04:11:53,1.641700,74.620836,-100,21.326784,25.338852,29.866140,32.970756,38.043180,-100.000000,-100.000000,-100.000000,-100.000000,34.579572,30.354768,27.180348,22.673004,19.588332,19.659798,17.249898,15.538038,12.814851,10.915185,9.440991,8.386452,7.786470,7.377618,5.809521,4.681023,3.639780,3.002403,2.893542,2.030133,0.042381,0.039888,0.034902,0.035733,0.393894,0.311625,0.284202,0.306639,0.379767,0.364809,0.413007,0.452064,0.422148,0.466191,0.586686,0.661476,0.787788,1.035426,1.493307,1.880553,2.196333,2.808780,3.922320,5.563545,7.229700,7.961811,9.141831,10.203018,11.921526,14.310651,16.663212,18.319395,21.394926,21.326784,25.338852,29.866140,32.970756,38.043180,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000,-100.000000

diff --git a/docs/source/images/Screenshot from 2019-12-02 09-06-41.png b/docs/source/images/Screenshot from 2019-12-02 09-06-41.png
diff --git a/docs/source/images/beta_map.png b/docs/source/images/beta_map.png
diff --git a/docs/source/images/camera_array.png b/docs/source/images/camera_array.png
diff --git a/docs/source/images/los2.png b/docs/source/images/los2.png
diff --git a/docs/source/images/map_los_roi_grid.png b/docs/source/images/map_los_roi_grid.png
diff --git a/docs/source/images/roi_grid_los_and_settings.png b/docs/source/images/roi_grid_los_and_settings.png
diff --git a/docs/source/images/server_settings_capture_tab.png b/docs/source/images/server_settings_capture_tab.png
diff --git a/docs/source/images/server_settings_general_tab.png b/docs/source/images/server_settings_general_tab.png
diff --git a/docs/source/images/space_carving.png b/docs/source/images/space_carving.png
diff --git a/docs/source/images/square_roi_and_LOS.png b/docs/source/images/square_roi_and_LOS.png
diff --git a/docs/source/images/square_roi_grid_LOS.png b/docs/source/images/square_roi_grid_LOS.png
diff --git a/scripts_client/start_local.py b/scripts_client/start_local.py
@@ -72,8 +72,9 @@ def main(base_path, debug_mode=False, local_proxy=False):
     #
     servers = []
     for path in camera_paths:
+
         servers.append(sbp.Popen(['python'] +
-                                 ['../scripts/start_server.py','--local_path', path] +
+                                 ['../scripts/start_server.py', '--local_path', path] +
                                  (["--local_proxy"] if local_proxy else [])))
 
     for server in servers: