diff options
| -rwxr-xr-x | utils/raspberrypi/ctt/ctt.py | 70 | ||||
| -rw-r--r-- | utils/raspberrypi/ctt/ctt_awb.py | 2 | ||||
| -rw-r--r-- | utils/raspberrypi/ctt/ctt_ccm.py | 4 | ||||
| -rw-r--r-- | utils/raspberrypi/ctt/ctt_image_load.py | 10 | ||||
| -rw-r--r-- | utils/raspberrypi/ctt/ctt_macbeth_locator.py | 2 | ||||
| -rw-r--r-- | utils/raspberrypi/ctt/ctt_pretty_print_json.py | 2 |
6 files changed, 45 insertions, 45 deletions
diff --git a/utils/raspberrypi/ctt/ctt.py b/utils/raspberrypi/ctt/ctt.py index ba2dbd71..97cadfe8 100755 --- a/utils/raspberrypi/ctt/ctt.py +++ b/utils/raspberrypi/ctt/ctt.py @@ -78,78 +78,78 @@ class Camera: initial json dict populated by uncalibrated values """ self.json = { - "rpi.black_level" : { - "black_level" : 4096 + "rpi.black_level": { + "black_level": 4096 }, - "rpi.dpc" : { + "rpi.dpc": { }, - "rpi.lux" : { + "rpi.lux": { "reference_shutter_speed": 10000, "reference_gain": 1, "reference_aperture": 1.0 }, - "rpi.noise" : { + "rpi.noise": { }, - "rpi.geq" : { + "rpi.geq": { }, "rpi.sdn": { }, "rpi.awb": { - "priors" : [ + "priors": [ {"lux": 0, "prior": [2000, 1.0, 3000, 0.0, 13000, 0.0]}, {"lux": 800, "prior": [2000, 0.0, 6000, 2.0, 13000, 2.0]}, {"lux": 1500, "prior": [2000, 0.0, 4000, 1.0, 6000, 6.0, 6500, 7.0, 7000, 1.0, 13000, 1.0]} ], - "modes" : { - "auto" : {"lo" : 2500, "hi" : 8000}, - "incandescent" : {"lo" : 2500, "hi" : 3000}, - "tungsten" : {"lo" : 3000, "hi" : 3500}, - "fluorescent" : {"lo" : 4000, "hi" : 4700}, - "indoor" : {"lo" : 3000, "hi" : 5000}, - "daylight" : {"lo" : 5500, "hi" : 6500}, - "cloudy" : {"lo" : 7000, "hi" : 8600} + "modes": { + "auto": {"lo": 2500, "hi": 8000}, + "incandescent": {"lo": 2500, "hi": 3000}, + "tungsten": {"lo": 3000, "hi": 3500}, + "fluorescent": {"lo": 4000, "hi": 4700}, + "indoor": {"lo": 3000, "hi": 5000}, + "daylight": {"lo": 5500, "hi": 6500}, + "cloudy": {"lo": 7000, "hi": 8600} }, - "bayes" : 1 + "bayes": 1 }, - "rpi.agc" : { - "metering_modes" : { - "centre-weighted" : { - "weights" : [3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0] + "rpi.agc": { + "metering_modes": { + "centre-weighted": { + "weights": [3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0] }, - "spot" : { - "weights" : [2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + "spot": { + "weights": [2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] }, "matrix": { - "weights" : [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + "weights": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] } }, - "exposure_modes" : { - "normal" : { - "shutter" : [100, 10000, 30000, 60000, 120000], - "gain" : [1.0, 2.0, 4.0, 6.0, 6.0] + "exposure_modes": { + "normal": { + "shutter": [100, 10000, 30000, 60000, 120000], + "gain": [1.0, 2.0, 4.0, 6.0, 6.0] }, "sport": { "shutter": [100, 5000, 10000, 20000, 120000], "gain": [1.0, 2.0, 4.0, 6.0, 6.0 ] } }, - "constraint_modes" : { - "normal" : [ - {"bound" : "LOWER", "q_lo" : 0.98, "q_hi" : 1.0, "y_target" : [0, 0.5, 1000, 0.5]} + "constraint_modes": { + "normal": [ + {"bound": "LOWER", "q_lo": 0.98, "q_hi": 1.0, "y_target": [0, 0.5, 1000, 0.5]} ], "highlight": [ {"bound": "LOWER", "q_lo": 0.98, "q_hi": 1.0, "y_target": [0, 0.5, 1000, 0.5]}, {"bound": "UPPER", "q_lo": 0.98, "q_hi": 1.0, "y_target": [0, 0.8, 1000, 0.8]} ] }, - "y_target" : [0, 0.16, 1000, 0.165, 10000, 0.17] + "y_target": [0, 0.16, 1000, 0.165, 10000, 0.17] }, "rpi.alsc": { - 'omega' : 1.3, - 'n_iter' : 100, - 'luminance_strength' : 0.7, + 'omega': 1.3, + 'n_iter': 100, + 'luminance_strength': 0.7, }, - "rpi.contrast" : { + "rpi.contrast": { "ce_enable": 1, "gamma_curve": [ 0, 0, diff --git a/utils/raspberrypi/ctt/ctt_awb.py b/utils/raspberrypi/ctt/ctt_awb.py index 9a92033b..297ba178 100644 --- a/utils/raspberrypi/ctt/ctt_awb.py +++ b/utils/raspberrypi/ctt/ctt_awb.py @@ -197,7 +197,7 @@ def awb(Cam, cal_cr_list, cal_cb_list, plot): iterate backwards over list for easier indexing """ i = len(c_fit) - 1 - while i > 0 : + while i > 0: if c_fit[i] > c_fit[i-1]: Cam.log += '\nColour temperature increase found\n' Cam.log += '{} K at r = {} to '.format(c_fit[i-1], r_fit[i-1]) diff --git a/utils/raspberrypi/ctt/ctt_ccm.py b/utils/raspberrypi/ctt/ctt_ccm.py index 44fb8188..769603b9 100644 --- a/utils/raspberrypi/ctt/ctt_ccm.py +++ b/utils/raspberrypi/ctt/ctt_ccm.py @@ -148,8 +148,8 @@ def ccm(Cam, cal_cr_list, cal_cb_list): ccms = [] for i in sorted_ccms: ccms.append({ - 'ct' : i[0], - 'ccm' : i[1] + 'ct': i[0], + 'ccm': i[1] }) return ccms diff --git a/utils/raspberrypi/ctt/ctt_image_load.py b/utils/raspberrypi/ctt/ctt_image_load.py index 7d097118..035256e3 100644 --- a/utils/raspberrypi/ctt/ctt_image_load.py +++ b/utils/raspberrypi/ctt/ctt_image_load.py @@ -45,11 +45,11 @@ class Image: Channel order depending on bayer pattern """ bayer_case = { - 0 : (0, 1, 2, 3), #red - 1 : (2, 0, 3, 1), #green next to red - 2 : (3, 2, 1, 0), #green next to blue - 3 : (1, 0, 3, 2), #blue - 128 : (0, 1, 2, 3) #arbitrary order for greyscale casw + 0: (0, 1, 2, 3), #red + 1: (2, 0, 3, 1), #green next to red + 2: (3, 2, 1, 0), #green next to blue + 3: (1, 0, 3, 2), #blue + 128: (0, 1, 2, 3) #arbitrary order for greyscale casw } self.order = bayer_case[self.pattern] diff --git a/utils/raspberrypi/ctt/ctt_macbeth_locator.py b/utils/raspberrypi/ctt/ctt_macbeth_locator.py index 591459aa..949e3686 100644 --- a/utils/raspberrypi/ctt/ctt_macbeth_locator.py +++ b/utils/raspberrypi/ctt/ctt_macbeth_locator.py @@ -180,7 +180,7 @@ def find_macbeth(Cam, img, mac_config=(0, 0)): if small_chart: - if cor < 0.75 and d_best > 1 : + if cor < 0.75 and d_best > 1: imgs = [] shape = list(img.shape[:2]) w, h = shape diff --git a/utils/raspberrypi/ctt/ctt_pretty_print_json.py b/utils/raspberrypi/ctt/ctt_pretty_print_json.py index 44a9311b..63b042de 100644 --- a/utils/raspberrypi/ctt/ctt_pretty_print_json.py +++ b/utils/raspberrypi/ctt/ctt_pretty_print_json.py @@ -61,7 +61,7 @@ def process_char(c, fout, state): state["skipnewline"] = (c == '[') def pretty_print_json(str_in, output_filename): - state = {"indent": 0, "inarray": [False], "arraycount": [], "skipnewline" : True} + state = {"indent": 0, "inarray": [False], "arraycount": [], "skipnewline": True} with open(output_filename, "w") as fout: process_file(str_in, fout, state) |