Loading isis/scripts/downloadIsisData +4 −4 Original line number Original line Diff line number Diff line Loading @@ -100,13 +100,13 @@ def rclone(command, config=None, extra_args=[], redirect_stdout=True, redirect_s raise Exception(message) raise Exception(message) def get_kernal_destination_path(source_type): def get_kernel_destination_path(source_type): try: try: source_path = SOURCE_PATH.get(source_type) source_path = SOURCE_PATH.get(source_type) except KeyError as e: except KeyError as e: raise KeyError(f"kernal path not found. Source type {source_type} is invalid") raise KeyError(f"kernel path not found. Source type {source_type} is invalid") log.debug(f"source path for {source_type} is {source_path}" ) log.debug(f"source path for {source_type} is {source_path}" ) return source_path return source_path Loading @@ -131,8 +131,8 @@ def create_rclone_arguments(destination, mission_name, ntransfers=10, rclone_kwa log.debug(f"Mission_dir_name: {mission_dir_name}, source_type: {source_type}") log.debug(f"Mission_dir_name: {mission_dir_name}, source_type: {source_type}") destination = os.path.join(destination, str(mission_dir_name).replace(":","")) destination = os.path.join(destination, str(mission_dir_name).replace(":","")) #add kernal directory path if needed #add kernel directory path if needed destination = os.path.join(destination, get_kernal_destination_path(source_type)) destination = os.path.join(destination, get_kernel_destination_path(source_type)) extra_args=[f"{mission_name}",f"{destination}", "--progress", f"--checkers={ntransfers}", f"--transfers={ntransfers}", "--track-renames", f"--log-level={log.getLevelName(log.getLogger().getEffectiveLevel())}"] extra_args=[f"{mission_name}",f"{destination}", "--progress", f"--checkers={ntransfers}", f"--transfers={ntransfers}", "--track-renames", f"--log-level={log.getLevelName(log.getLogger().getEffectiveLevel())}"] extra_args.extend(rclone_kwargs) extra_args.extend(rclone_kwargs) Loading isis/src/apollo/apps/apollopaninit/main.cpp +3 −3 Original line number Original line Diff line number Diff line Loading @@ -186,7 +186,7 @@ void IsisMain() { panCube.putGroup(inst_pvlG); panCube.putGroup(inst_pvlG); ///////////////////////////////////The kernals group ///////////////////////////////////The kernels group kernels_pvlG.setName("Kernels"); kernels_pvlG.setName("Kernels"); kernels_pvlG.clear(); kernels_pvlG.clear(); Loading Loading @@ -228,7 +228,7 @@ void IsisMain() { panCube.putGroup(kernels_pvlG); panCube.putGroup(kernels_pvlG); //Load all the kernals //Load all the kernels Load_Kernel(kernels_pvlG["TargetPosition"]); Load_Kernel(kernels_pvlG["TargetPosition"]); Load_Kernel(kernels_pvlG["TargetAttitudeShape"]); Load_Kernel(kernels_pvlG["TargetAttitudeShape"]); Load_Kernel(kernels_pvlG["LeapSecond"]); Load_Kernel(kernels_pvlG["LeapSecond"]); Loading Loading @@ -792,7 +792,7 @@ void IsisMain() { // without shoe-horning the input to please the rest of the Spice::Init() funciton // without shoe-horning the input to please the rest of the Spice::Init() funciton void Load_Kernel(Isis::PvlKeyword &key) { void Load_Kernel(Isis::PvlKeyword &key) { //Load all the kernal files (file names are stored as values of the PvlKeyword) //Load all the kernel files (file names are stored as values of the PvlKeyword) NaifStatus::CheckErrors(); NaifStatus::CheckErrors(); for(int i = 0; i < key.size(); i++) { for(int i = 0; i < key.size(); i++) { Loading isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.h +1 −1 Original line number Original line Diff line number Diff line Loading @@ -38,7 +38,7 @@ namespace Isis { * to get spacecraft and instrument names. Extended unit test to test * to get spacecraft and instrument names. Extended unit test to test * these methods. * these methods. * @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Modified check for determing * @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Modified check for determing * the instrument name to also accept filter instrument kernal codes. * the instrument name to also accept filter instrument kernel codes. * References #2335. * References #2335. * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * members and methods and removed implementation of these methods Loading isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.cpp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -59,7 +59,7 @@ namespace Isis { // Set up the camera info from ik/iak kernels // Set up the camera info from ik/iak kernels SetFocalLength(); SetFocalLength(); //Kaguya IK kernal uses INS-131???_PIXEL_SIZE instead of PIXEL_PITCH //Kaguya IK kernel uses INS-131???_PIXEL_SIZE instead of PIXEL_PITCH QString ikernKey = "INS" + toString(naifIkCode()) + "_PIXEL_SIZE"; QString ikernKey = "INS" + toString(naifIkCode()) + "_PIXEL_SIZE"; SetPixelPitch(getDouble(ikernKey)); SetPixelPitch(getDouble(ikernKey)); Loading isis/src/mer/apps/mical/MiCalibration.cpp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -48,7 +48,7 @@ namespace Isis { * use the instrumentSerialnumber to determain what rover * use the instrumentSerialnumber to determain what rover * the image is from that get the values for that rover. * the image is from that get the values for that rover. * * * @param kernel - the kernal from the data area or user * @param kernel - the kernel from the data area or user * entered. * entered. */ */ void MiCalibration::ReadKernel(Pvl &kernel) { void MiCalibration::ReadKernel(Pvl &kernel) { Loading Loading
isis/scripts/downloadIsisData +4 −4 Original line number Original line Diff line number Diff line Loading @@ -100,13 +100,13 @@ def rclone(command, config=None, extra_args=[], redirect_stdout=True, redirect_s raise Exception(message) raise Exception(message) def get_kernal_destination_path(source_type): def get_kernel_destination_path(source_type): try: try: source_path = SOURCE_PATH.get(source_type) source_path = SOURCE_PATH.get(source_type) except KeyError as e: except KeyError as e: raise KeyError(f"kernal path not found. Source type {source_type} is invalid") raise KeyError(f"kernel path not found. Source type {source_type} is invalid") log.debug(f"source path for {source_type} is {source_path}" ) log.debug(f"source path for {source_type} is {source_path}" ) return source_path return source_path Loading @@ -131,8 +131,8 @@ def create_rclone_arguments(destination, mission_name, ntransfers=10, rclone_kwa log.debug(f"Mission_dir_name: {mission_dir_name}, source_type: {source_type}") log.debug(f"Mission_dir_name: {mission_dir_name}, source_type: {source_type}") destination = os.path.join(destination, str(mission_dir_name).replace(":","")) destination = os.path.join(destination, str(mission_dir_name).replace(":","")) #add kernal directory path if needed #add kernel directory path if needed destination = os.path.join(destination, get_kernal_destination_path(source_type)) destination = os.path.join(destination, get_kernel_destination_path(source_type)) extra_args=[f"{mission_name}",f"{destination}", "--progress", f"--checkers={ntransfers}", f"--transfers={ntransfers}", "--track-renames", f"--log-level={log.getLevelName(log.getLogger().getEffectiveLevel())}"] extra_args=[f"{mission_name}",f"{destination}", "--progress", f"--checkers={ntransfers}", f"--transfers={ntransfers}", "--track-renames", f"--log-level={log.getLevelName(log.getLogger().getEffectiveLevel())}"] extra_args.extend(rclone_kwargs) extra_args.extend(rclone_kwargs) Loading
isis/src/apollo/apps/apollopaninit/main.cpp +3 −3 Original line number Original line Diff line number Diff line Loading @@ -186,7 +186,7 @@ void IsisMain() { panCube.putGroup(inst_pvlG); panCube.putGroup(inst_pvlG); ///////////////////////////////////The kernals group ///////////////////////////////////The kernels group kernels_pvlG.setName("Kernels"); kernels_pvlG.setName("Kernels"); kernels_pvlG.clear(); kernels_pvlG.clear(); Loading Loading @@ -228,7 +228,7 @@ void IsisMain() { panCube.putGroup(kernels_pvlG); panCube.putGroup(kernels_pvlG); //Load all the kernals //Load all the kernels Load_Kernel(kernels_pvlG["TargetPosition"]); Load_Kernel(kernels_pvlG["TargetPosition"]); Load_Kernel(kernels_pvlG["TargetAttitudeShape"]); Load_Kernel(kernels_pvlG["TargetAttitudeShape"]); Load_Kernel(kernels_pvlG["LeapSecond"]); Load_Kernel(kernels_pvlG["LeapSecond"]); Loading Loading @@ -792,7 +792,7 @@ void IsisMain() { // without shoe-horning the input to please the rest of the Spice::Init() funciton // without shoe-horning the input to please the rest of the Spice::Init() funciton void Load_Kernel(Isis::PvlKeyword &key) { void Load_Kernel(Isis::PvlKeyword &key) { //Load all the kernal files (file names are stored as values of the PvlKeyword) //Load all the kernel files (file names are stored as values of the PvlKeyword) NaifStatus::CheckErrors(); NaifStatus::CheckErrors(); for(int i = 0; i < key.size(); i++) { for(int i = 0; i < key.size(); i++) { Loading
isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.h +1 −1 Original line number Original line Diff line number Diff line Loading @@ -38,7 +38,7 @@ namespace Isis { * to get spacecraft and instrument names. Extended unit test to test * to get spacecraft and instrument names. Extended unit test to test * these methods. * these methods. * @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Modified check for determing * @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Modified check for determing * the instrument name to also accept filter instrument kernal codes. * the instrument name to also accept filter instrument kernel codes. * References #2335. * References #2335. * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * members and methods and removed implementation of these methods Loading
isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.cpp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -59,7 +59,7 @@ namespace Isis { // Set up the camera info from ik/iak kernels // Set up the camera info from ik/iak kernels SetFocalLength(); SetFocalLength(); //Kaguya IK kernal uses INS-131???_PIXEL_SIZE instead of PIXEL_PITCH //Kaguya IK kernel uses INS-131???_PIXEL_SIZE instead of PIXEL_PITCH QString ikernKey = "INS" + toString(naifIkCode()) + "_PIXEL_SIZE"; QString ikernKey = "INS" + toString(naifIkCode()) + "_PIXEL_SIZE"; SetPixelPitch(getDouble(ikernKey)); SetPixelPitch(getDouble(ikernKey)); Loading
isis/src/mer/apps/mical/MiCalibration.cpp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -48,7 +48,7 @@ namespace Isis { * use the instrumentSerialnumber to determain what rover * use the instrumentSerialnumber to determain what rover * the image is from that get the values for that rover. * the image is from that get the values for that rover. * * * @param kernel - the kernal from the data area or user * @param kernel - the kernel from the data area or user * entered. * entered. */ */ void MiCalibration::ReadKernel(Pvl &kernel) { void MiCalibration::ReadKernel(Pvl &kernel) { Loading