Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add path parameter to load_kl1/kl11_camera #22

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Add path parameter to load_kl1/kl11_camera #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions cherab/jet/cameras/kl1/load_kl1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,25 @@
from cherab.tools.observers import load_calcam_calibration


def load_kl1_camera(parent=None, pipelines=None):
def load_kl1_camera(parent=None, pipelines=None, stride=1,
calibration_file = '/home/mcarr/cherab/cherab_jet/cherab/jet/cameras/kl1/kl1-e4wc-sightlines.nc'):
"""
Load Camera calibration fron an *.nc file.

camera_config = load_calcam_calibration('/home/mcarr/cherab/cherab_jet/cherab/jet/cameras/kl1/kl1-e4wc-sightlines.nc')
:param parent: parent of the camera observer
:param pipeline: camera pipelines
:param stride: Binning parameter, only every nth pixel from the calibration is used
"""

camera_config = load_calcam_calibration(calibration_file)

if not pipelines:
power_unfiltered = PowerPipeline2D(display_unsaturated_fraction=0.96, name="Unfiltered Power (W)")
power_unfiltered.display_update_time = 15
pipelines = [power_unfiltered]

pixels_shape, pixel_origins, pixel_directions = camera_config
camera = VectorCamera(pixel_origins, pixel_directions, pipelines=pipelines, parent=parent)
camera = VectorCamera(pixel_origins[::stride, ::stride], pixel_directions[::stride, ::stride], pipelines=pipelines, parent=parent)
camera.spectral_bins = 15
camera.pixel_samples = 1

Expand Down
15 changes: 13 additions & 2 deletions cherab/jet/cameras/kl11/load_kl11.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,20 @@
from cherab.tools.inversions import ToroidalVoxelGrid


def load_kl11_camera(parent=None, pipelines=None, stride=1):
def load_kl11_camera(parent=None, pipelines=None, stride=1,
calibration_file = '/home/mcarr/cherab/cherab_jet/cherab/jet/cameras/kl11/KL11-E1DC_87516.nc'):
"""
Load Camera calibration fron an *.nc file.

camera_config = load_calcam_calibration('/home/mcarr/cherab/cherab_jet/cherab/jet/cameras/kl11/KL11-E1DC_87516.nc')
:param parent: Parent of the camera observer
:param pipeline: Camera pipelines
:param stride: Binning parameter, only every nth pixel from the calibration is used
:param configuration_file: Path to the camera calibration file

return
"""

camera_config = load_calcam_calibration(calibration_file)

if not pipelines:
power_unfiltered = PowerPipeline2D(display_unsaturated_fraction=0.96, name="Unfiltered Power (W)")
Expand Down