Commit 322a73f2 authored by Zhang, Yuanpeng's avatar Zhang, Yuanpeng ⭐
Browse files

fix the proton charge normalization issue

parent 3bab6ca5

reduce_PG3_live_post_proc.py

+16 −14
Original line number Diff line number Diff line
@@ -34,24 +34,17 @@ strip_v_pp_tol = input_config["Params"]["PostProc"]["StripVPeaksPosTol"] 
strip_v_bt = input_config["Params"]["PostProc"]["StripVPeaksBkgType"]

# <----- Config: Live post processing parameters



simpleapi.CompressEvents(

    InputWorkspace=input,

    OutputWorkspace=output

)



if simpleapi.mtd[str(input)].run().getProtonCharge() > 0.:

accum_prtc = simpleapi.mtd[str(input)].run().getProtonCharge()

if accum_prtc > 0.:

    mantid.logger.information(f"Accumulated proton charge: {accum_prtc}")

    simpleapi.NormaliseByCurrent(

        InputWorkspace=input,

        OutputWorkspace=output

    )



simpleapi.LoadNexus(

    Filename=f"/SNS/PG3/shared/livereduce/tmp/input.nxs",

    OutputWorkspace="input_reloaded"

        OutputWorkspace=output,

        RecalculatePCharge=True

    )



simpleapi.PDDetermineCharacterizations(

    InputWorkspace="input_reloaded",

    InputWorkspace=input,

    Characterizations='characterizations',

    ReductionProperties='__pd_reduction_properties'

)
@@ -133,6 +126,12 @@ if can is not None: 
        WorkspaceToMatch=output,

        OutputWorkspace=can

    )

    simpleapi.SaveNexus(

        InputWorkspace=can,

        Filename=f"/SNS/PG3/shared/livereduce/tmp/can_{can}_final.nxs")

    simpleapi.SaveNexus(

        InputWorkspace=output,

        Filename=f"/SNS/PG3/shared/livereduce/tmp/live_check.nxs")

    simpleapi.Minus(

        LHSWorkspace=output,

        RHSWorkspace=can,
@@ -226,6 +225,9 @@ if van is not None: 
        WorkspaceToMatch=output,

        OutputWorkspace=van

    )

    simpleapi.SaveNexus(

        InputWorkspace=van,

        Filename=f"/SNS/PG3/shared/livereduce/tmp/van_{van}_final.nxs")

    simpleapi.Divide(

        LHSWorkspace=output,

        RHSWorkspace=van,

reduce_PG3_live_proc.py

+0 −4
Original line number Diff line number Diff line
@@ -103,7 +103,3 @@ simpleapi.Rebin( 
    InputWorkspace=output,

    OutputWorkspace=output,

    Params=f"{d_min_v + 0.01}, 0.001, {d_max_v}")
 
simpleapi.SaveNexus(

    InputWorkspace=output,

    Filename="/SNS/PG3/shared/livereduce/tmp/input.nxs"

)