Commit 032626b7 authored by Zhang, Yuanpeng's avatar Zhang, Yuanpeng ⭐
Browse files

finish up calib diagnostics

parent 127ab296

autoreduce/PG3_PAC_d62140_2026-03-05.h5

(708 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

autoreduce/inputs/PG3_PAC_d62140_2026-03-05.json

+28 −2
Original line number Diff line number Diff line
@@ -17,5 +17,31 @@ 
        "CalibrationParameters": "DIFC+TZERO+DIFA",

        "TZEROrange": "-50,50"

    },

    "ManualMaskFile": "2022-2_11A_CAL/Masks/PG3_43095_manual_mask.xml"

    "ManualMaskFile": "2022-2_11A_CAL/Masks/PG3_43095_manual_mask.xml",

    "Diagnostics": {

        "PAC": {

            "NumMasks": [3790, 200],

            "NumBadUnmasked": 50

        },

        "MAG": {

            "NumMasks": [10400, 250],

            "NumBadUnmasked": 300

        },

        "OC": {

            "NumMasks": [4340, 200],

            "NumBadUnmasked": 50

        },

        "MICAS": {

            "NumMasks": [3250, 200],

            "NumBadUnmasked": 350

        },

        "LTJANIS": {

            "NumMasks": [4050, 200],

            "NumBadUnmasked": 50

        },

        "JANISGAS": {

            "NumMasks": [3600, 200],

            "NumBadUnmasked": 30

        }

    }

}

cal_config.json

+28 −2
Original line number Diff line number Diff line
@@ -17,5 +17,31 @@ 
        "CalibrationParameters": "DIFC+TZERO+DIFA",

        "TZEROrange": "-50,50"

    },

    "ManualMaskFile": "2022-2_11A_CAL/Masks/PG3_43095_manual_mask.xml"

    "ManualMaskFile": "2022-2_11A_CAL/Masks/PG3_43095_manual_mask.xml",

    "Diagnostics": {

        "PAC": {

            "NumMasks": [3790, 200],

            "NumBadUnmasked": 50

        },

        "MAG": {

            "NumMasks": [10400, 250],

            "NumBadUnmasked": 300

        },

        "OC": {

            "NumMasks": [4340, 200],

            "NumBadUnmasked": 50

        },

        "MICAS": {

            "NumMasks": [3250, 200],

            "NumBadUnmasked": 350

        },

        "LTJANIS": {

            "NumMasks": [4050, 200],

            "NumBadUnmasked": 50

        },

        "JANISGAS": {

            "NumMasks": [3600, 200],

            "NumBadUnmasked": 30

        }

    }

}

pg3_cal_legacy.py

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ from mantid.simpleapi import ApplyDiffCal, \ 
    CreateDetectorTable, \

    CreateEmptyTableWorkspace, \

    CreateGroupingWorkspace, \

    CropWorkspace, \

    DiffractionFocussing, \

    Load, \

    LoadDiffCal, \
@@ -357,6 +358,11 @@ ApplyDiffCal(InstrumentWorkspace=dia_check, 
             CalibrationWorkspace="_cal")

MaskDetectors(Workspace=dia_check,

              MaskedWorkspace="_mask")

CropWorkspace(

    InputWorkspace=dia_check,

    OutputWorkspace=dia_check,

    XMin=300

)

ConvertUnits(InputWorkspace=dia_check,

             OutputWorkspace="dia_check_d",

             Target="dSpacing",

pg3_cal_legacy_local.py

+12 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ from mantid.simpleapi import ApplyDiffCal, \ 
    CreateDetectorTable, \

    CreateEmptyTableWorkspace, \

    CreateGroupingWorkspace, \

    CropWorkspace, \

    DiffractionFocussing, \

    Load, \

    LoadDiffCal, \
@@ -31,6 +32,7 @@ from Scripts.pg3_align_diagnostics import pg3_align 
import plotly.io as pio

import plotly.graph_objs as go

import shutil

import sys



import mantid

mantid.config.updateFacilities('/opt/anaconda/envs/mantid/instrument/Facilities.xml')
@@ -286,8 +288,11 @@ out_input_dir_2 = os.path.join( 
    os.path.splitext(os.path.basename(cal_file_name))[0] + ".json"

)



try:

    shutil.copy(cal_config_f, out_input_dir_1)

    shutil.copy(cal_config_f, out_input_dir_2)

except shutil.SameFileError:

    pass



if notes.strip() != "":

    log_file_name = f"{instr_name}_{sam_env}_{dia_name}_{date}-{notes}.log"
@@ -358,6 +363,11 @@ ApplyDiffCal(InstrumentWorkspace=dia_check, 
             CalibrationWorkspace="_cal")

MaskDetectors(Workspace=dia_check,

              MaskedWorkspace="_mask")

CropWorkspace(

    InputWorkspace=dia_check,

    OutputWorkspace=dia_check,

    XMin=300

)

ConvertUnits(InputWorkspace=dia_check,

             OutputWorkspace="dia_check_d",

             Target="dSpacing",