update hyb2onc2isis to support newer image format

isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncArchive.trn

@@ -16,6 +16,7 @@ End_Group
 Group = L0FileName
   Auto  
   InputKey       = P_L0NAME
+  InputKey       = L0FILE
   InputPosition  = FitsLabels
   OutputName     = L0FileName
   OutputPosition = (Object, IsisCube, Group, Archive)
@@ -94,6 +95,7 @@ End_Group
 # AMICA calls this one "ImageNumber"
 Group = ImageNumber
   Auto
+  Optional
   InputKey       = P_IMGID
   InputPosition  = FitsExtras
   OutputName     = ImageNumber

isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncInstrument.trn

@@ -16,6 +16,7 @@ End_Group
 Group = InstrumentId
   Auto
   InputKey       = P_NAME
+  InputKey       = NAIFNAME
   InputPosition  = FitsLabels
   OutputName     = InstrumentId
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -79,6 +80,7 @@ End_Group
 Group = ExposureDuration
   Auto
   InputKey       = EXPOSURE
+  InputKey       = XPOSURE
   InputPosition  = FitsLabels
   OutputName     = ExposureDuration
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -88,6 +90,7 @@ End_Group
 Group = SpacecraftClockStartCount
   Auto
   InputKey       = P_SCCSC
+  InputKey       = SCCL-BEG
   InputPosition  = FitsLabels
   OutputName     = SpacecraftClockStartCount
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -97,6 +100,7 @@ End_Group
 Group = SpacecraftClockEndCount
   Auto
   InputKey       = P_SCCEC
+  InputKey       = SCCL-END
   InputPosition  = FitsLabels
   OutputName     = SpacecraftClockStartCount
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -116,6 +120,7 @@ End_Group
 #s/c counter at data recorded time
 Group = OnboardDataRecordedTime
   Auto
+  Optional
   InputKey       = P_RECTI
   InputPosition  = FitsExtras
   OutputName     = OnboardDataRecordedTime
@@ -126,6 +131,7 @@ End_Group
 Group = Binning
   Auto
   InputKey       = P_BINN
+  InputKey       = NPIXBIN
   InputPosition  = FitsLabels
   OutputName     = Binning
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -136,6 +142,7 @@ End_Group
 Group = SelectedImageAreaX1
   Auto
   InputKey       = P_OPOSX1
+  InputKey       = ROI_LLX
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaX1
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -145,6 +152,7 @@ End_Group
 Group = SelectedImageAreaY1
   Auto
   InputKey       = P_OPOSY1
+  InputKey       = ROI_LLY
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaY1
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -154,6 +162,7 @@ End_Group
 Group = SelectedImageAreaX2
   Auto
   InputKey       = P_OPOSX2
+  InputKey       = ROI_URX
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaX2
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -163,6 +172,7 @@ End_Group
 Group = SelectedImageAreaY2
   Auto
   InputKey       = P_OPOSY2
+  InputKey       = ROI_URY
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaY2
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -171,6 +181,7 @@ End_Group
 
 Group = SelectedImageAreaX3
   Auto
+  Optional
   InputKey       = P_OPOSX3
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaX3
@@ -180,6 +191,7 @@ End_Group
 
 Group = SelectedImageAreaY3
   Auto
+  Optional
   InputKey       = P_OPOSY3
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaY3
@@ -189,6 +201,7 @@ End_Group
 
 Group = SelectedImageAreaX4
   Auto
+  Optional
   InputKey       = P_OPOSX4
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaX4
@@ -198,6 +211,7 @@ End_Group
 
 Group = SelectedImageAreaY4
   Auto
+  Optional
   InputKey       = P_OPOSY4
   InputPosition  = FitsLabels
   OutputName     = SelectedImageAreaY4
@@ -217,6 +231,7 @@ End_Group
 Group = OffsetCorrection
   Auto
   InputKey       = OFFSETCR
+  InputKey       = AOFFSET
   InputPosition  = FitsLabels
   OutputName     = OffsetCorrection
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -235,6 +250,7 @@ End_Group
 Group = RadianceConversion
   Auto
   InputKey       = RADIANCE
+  InputKey       = RADCONV
   InputPosition  = FitsLabels
   OutputName     = RadianceConversion
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -262,6 +278,7 @@ End_Group
 Group = L2BFlatFileName
   Auto
   InputKey       = L2BFLTFN
+  InputKey       = FLATFN
   InputPosition  = FitsLabels
   OutputName     = L2BFlatFileName
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -270,6 +287,7 @@ End_Group
 
 Group = L2BSystemEfficiencyFileName
   Auto
+  Optional
   InputKey       = L2BEFCFN
   InputPosition  = FitsLabels
   OutputName     = L2BSystemEfficiencyFileName
@@ -280,6 +298,7 @@ End_Group
 Group = L2CShapeModelFileName
   Auto
   InputKey       = L2CSHPFN
+  InputKey       = SHAPEFN
   InputPosition  = FitsLabels
   OutputName     = L2CShapeModelFileName
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -289,6 +308,7 @@ End_Group
 Group = L2DPhaseFunctionFileName
   Auto
   InputKey       = L2DPHSFN
+  InputKey       = PHASEFN
   InputPosition  = FitsLabels
   OutputName     = L2DPhaseFunctionFileName
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -298,6 +318,7 @@ End_Group
 Group = L2DShapeModelFileName
   Auto
   InputKey       = L2DSHPFN
+  InputKey       = SHAPEFN
   InputPosition  = FitsLabels
   OutputName     = L2DShapeModelFileName
   OutputPosition = (Object, IsisCube, Group, Instrument)
@@ -307,6 +328,7 @@ End_Group
 # the following image ID is assigned by the onboard image processor:
 Group = ImageID
   Auto
+  Optional
   InputKey       = P_IMGID
   InputPosition  = FitsExtras
   OutputName     = ImageID
@@ -465,6 +487,7 @@ End_Group
 Group = Compression
   Auto
   InputKey       = P_CMPSTY
+  InputKey       = IMGCMPRV
   InputPosition  = FitsLabels
   OutputName     = Compression
   OutputPosition = (Object, IsisCube, Group, Instrument)

isis/src/hayabusa2/apps/hyb2onc2isis/Hayabusa2OncKernels.trn

@@ -7,6 +7,7 @@ Group = NaifCode
   Auto
   Optional
   InputKey       = P_ID
+  InputKey       = NAIFID
   InputPosition  = FitsLabels
   OutputName     = NaifFrameCode
   OutputPosition = (Object, IsisCube, Group, Kernels)

isis/src/hayabusa2/apps/hyb2onc2isis/tsts/newFits/Makefile

+# Test for new format of Hayabusa2 fits images released 2019-2020
+#
+# @history 2020-03-29 Kristin Berry - Added along with support for new format
+#
+APPNAME = hyb2onc2isis
+
+include $(ISISROOT)/make/isismake.tsts
+
+commands:
+	$(APPNAME) from=$(INPUT)/hyb2_onc_20180710_060508_tvf_l2a.fit  \
+	           to=$(OUTPUT)/hyb2_onc_20180710_060508_tvf_l2a.cub   \
+	           >& /dev/null;
+	catlab     from=$(OUTPUT)/hyb2_onc_20180710_060508_tvf_l2a.cub \
+	           to=$(OUTPUT)/labels.pvl                             \
+	           >& /dev/null;
+	catoriglab from=$(OUTPUT)/hyb2_onc_20180710_060508_tvf_l2a.cub \
+	           to=$(OUTPUT)/origLab.pvl                            \
+	           >& /dev/null;
\ No newline at end of file