Re #19509 Swapped instruments to use new absorb call

scripts/Diffraction/isis_powder/gem.py

@@ -63,8 +63,8 @@ class Gem(AbstractInst):
         return _gem_generate_inst_name(run_number=run_number)
 
     def _apply_absorb_corrections(self, run_details, van_ws):
-        return gem_algs.calculate_absorb_corrections(ws_to_correct=van_ws,
-                                                     multiple_scattering=self._inst_settings.multiple_scattering)
+        return gem_algs.calculate_van_absorb_corrections(ws_to_correct=van_ws,
+                                                         multiple_scattering=self._inst_settings.multiple_scattering)
 
     def _crop_banks_to_user_tof(self, focused_banks):
         return common.crop_banks_using_crop_list(focused_banks, self._inst_settings.focused_cropping_values)

scripts/Diffraction/isis_powder/gem_routines/gem_algs.py

@@ -8,13 +8,14 @@ from isis_powder.routines.run_details import create_run_details_object, \
 from isis_powder.gem_routines import gem_advanced_config
 
 
-def calculate_absorb_corrections(ws_to_correct, multiple_scattering):
+def calculate_van_absorb_corrections(ws_to_correct, multiple_scattering):
     # First 100 detectors are monitors or not connected to DAE
     mantid.MaskDetectors(ws_to_correct, SpectraList=list(range(0, 101)))
 
     absorb_dict = gem_advanced_config.absorption_correction_params
+    sample_details_obj = absorb_corrections.create_vanadium_sample_details_obj(config_dict=absorb_dict)
     ws_to_correct = absorb_corrections.run_cylinder_absorb_corrections(
-        ws_to_correct=ws_to_correct, multiple_scattering=multiple_scattering, config_dict=absorb_dict)
+        ws_to_correct=ws_to_correct, multiple_scattering=multiple_scattering, sample_details_obj=sample_details_obj)
     return ws_to_correct
 
 

scripts/Diffraction/isis_powder/polaris.py

@@ -45,8 +45,8 @@ class Polaris(AbstractInst):
 
     # Overrides
     def _apply_absorb_corrections(self, run_details, van_ws):
-        return polaris_algs.calculate_absorb_corrections(ws_to_correct=van_ws,
-                                                         multiple_scattering=self._inst_settings.multiple_scattering)
+        return polaris_algs.calculate_van_absorb_corrections(ws_to_correct=van_ws,
+                                                             multiple_scattering=self._inst_settings.multiple_scattering)
 
     @staticmethod
     def _can_auto_gen_vanadium_cal():

scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py

@@ -8,12 +8,13 @@ from isis_powder.routines.run_details import create_run_details_object, \
 from isis_powder.polaris_routines import polaris_advanced_config
 
 
-def calculate_absorb_corrections(ws_to_correct, multiple_scattering):
+def calculate_van_absorb_corrections(ws_to_correct, multiple_scattering):
     mantid.MaskDetectors(ws_to_correct, SpectraList=list(range(1, 55)))
 
     absorb_dict = polaris_advanced_config.absorption_correction_params
+    sample_details_obj = absorb_corrections.create_vanadium_sample_details_obj(config_dict=absorb_dict)
     ws_to_correct = absorb_corrections.run_cylinder_absorb_corrections(
-        ws_to_correct=ws_to_correct, multiple_scattering=multiple_scattering, config_dict=absorb_dict)
+        ws_to_correct=ws_to_correct, multiple_scattering=multiple_scattering, sample_details_obj=sample_details_obj)
     return ws_to_correct