Capture detector offset in isisimport and the ClipperPushBroomCamera

DOI-USGS · Oct 31, 2024 · c2f9275 · c2f9275
1 parent e873fdd
commit c2f9275
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/isis/appdata/import/PDS4/ClipperEIS.tpl b/isis/appdata/import/PDS4/ClipperEIS.tpl
@@ -75,6 +75,7 @@ Object = IsisCube
     TargetName                = {{ Product_Observational.Observation_Area.Target_Identification.name }}
     StartTime                 = {{ RemoveStartTimeZ(Product_Observational.Observation_Area.Time_Coordinates.start_date_time) }}
     ExposureDuration          = {{ Product_Observational.Observation_Area.Discipline_Area.img_Exposure.img_exposure_duration._text }} <{{ Product_Observational.Observation_Area.Discipline_Area.img_Exposure.img_exposure_duration.attrib_unit }}>
+    DetectorLineOffset        = {{ Product_Observational.Observation_Area.Mission_Area.clipper_Observation_Information.clipper_EIS_Parameters.clipper_Detector_Region.clipper_readout_start_row }}
   End_Group
 
 {% set filter=Product_Observational.Observation_Area.Mission_Area.clipper_Observation_Information.clipper_EIS_Parameters.clipper_filter_used %}

diff --git a/isis/src/clipper/objs/ClipperPushBroomCamera/ClipperPushBroomCamera.cpp b/isis/src/clipper/objs/ClipperPushBroomCamera/ClipperPushBroomCamera.cpp
@@ -68,7 +68,13 @@ namespace Isis {
     CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());
     // center of array (same for WAC and NAC based on XY origin in EIS_Sensor_summary.xlsx)
     focalMap->SetDetectorOrigin(2048.5, 0.5);
-    focalMap->SetDetectorOffset(0.0, 0.0);
+
+    // Can be +/- 1024 pixel offset
+    // Detector offset from label is 0 - 2047 but ISIS is zero based
+    // with the detector offset being +/- 1024 pixels (2048/2)
+    // Double check this against the SIS
+    double detectorOffset = toDouble(inst["DetectorOffset"]) - 1023.0;
+    focalMap->SetDetectorOffset(0.0, detectorOffset);
 
     // Set up distortion map
     CameraDistortionMap *distMap = new CameraDistortionMap(this);