Commit 130d66ec authored by Zhang, Yuanpeng's avatar Zhang, Yuanpeng ⭐
Browse files

fix issues

parent 4b4a4fe0

align_focus_can.py

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ simpleapi.LoadDiffCal(InstrumentName="PG3", 
                      Filename=cal_file,

                      WorkspaceName="PG3")



with open("/SNS/PG3/shared/livereduce/tmp/alignandfocuspowder_zyp.json", "r") as f:

with open("/SNS/PG3/shared/livereduce/tmp/alignandfocuspowder.json", "r") as f:

    af_config = json.load(f)

with open("/SNS/PG3/shared/livereduce/tmp/can_zyp.name", "r") as f:

with open("/SNS/PG3/shared/livereduce/tmp/can.name", "r") as f:

    can = f.readline().strip()



simpleapi.AlignAndFocusPowderFromFiles(Filename=can,

align_focus_van.py

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ simpleapi.LoadDiffCal(InstrumentName="PG3", 
                      Filename=cal_file,

                      WorkspaceName="PG3")



with open("/SNS/PG3/shared/livereduce/tmp/alignandfocuspowder_zyp.json", "r") as f:

with open("/SNS/PG3/shared/livereduce/tmp/alignandfocuspowder.json", "r") as f:

    af_config = json.load(f)

with open("/SNS/PG3/shared/livereduce/tmp/van_zyp.name", "r") as f:

with open("/SNS/PG3/shared/livereduce/tmp/van.name", "r") as f:

    van = f.readline().strip()



simpleapi.LoadEventNexus(Filename=van,

align_focus_vanback.py

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ simpleapi.LoadDiffCal(InstrumentName="PG3", 
                      Filename=cal_file,

                      WorkspaceName="PG3")



with open("/SNS/PG3/shared/livereduce/tmp/alignandfocuspowder_zyp.json", "r") as f:

with open("/SNS/PG3/shared/livereduce/tmp/alignandfocuspowder.json", "r") as f:

    af_config = json.load(f)

with open("/SNS/PG3/shared/livereduce/tmp/vanback_zyp.name", "r") as f:

with open("/SNS/PG3/shared/livereduce/tmp/vanback.name", "r") as f:

    vanback = f.readline().strip()



simpleapi.AlignAndFocusPowderFromFiles(Filename=vanback,

reduce_PG3_live_post_proc.py

+10 −9
Original line number Diff line number Diff line
@@ -82,14 +82,18 @@ else: 
                OutputWorkspace=output,

                RecalculatePCharge=True

            )

            simpleapi.SaveNexus(

                InputWorkspace=output,

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

            )

    except:

        raise Exception("Failed in proton charge normalization.")



    simpleapi.SaveNexus(

        InputWorkspace=input,

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

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

    simpleapi.LoadNexus(

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

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

        OutputWorkspace="pproc_in"

    )
@@ -141,13 +145,13 @@ else: 
    

    can = getRunId(manager, 'container')

    with open(

        "/SNS/PG3/shared/livereduce/tmp/alignandfocuspowder_zyp.json",

        "/SNS/PG3/shared/livereduce/tmp/alignandfocuspowder.json",

        "w"

    ) as f:

        json.dump(processingParams, f, indent=4)

    

    if can is not None and not simpleapi.mtd.doesExist(can):

        with open("/SNS/PG3/shared/livereduce/tmp/can_zyp.name", "w") as f:

        with open("/SNS/PG3/shared/livereduce/tmp/can.name", "w") as f:

            f.write(can)

        mantid.logger.information("processing container '%s'" % can)

        subprocess.run(
@@ -177,9 +181,6 @@ else: 
    



    if can is not None:

        simpleapi.SaveNexus(

            InputWorkspace=output,

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

        try:

            simpleapi.RebinToWorkspace(

                WorkspaceToRebin=can,
@@ -207,7 +208,7 @@ else: 
    

    van = getRunId(manager, 'vanadium')

    if van is not None and not simpleapi.mtd.doesExist(van):

        with open("/SNS/PG3/shared/livereduce/tmp/van_zyp.name", "w") as f:

        with open("/SNS/PG3/shared/livereduce/tmp/van.name", "w") as f:

            f.write(van)

        mantid.logger.information("processing vanadium '%s'" % van)

        subprocess.run(
@@ -230,7 +231,7 @@ else: 
        )

    

        vanback = getRunId(manager, 'vanadium_background')

        with open("/SNS/PG3/shared/livereduce/tmp/vanback_zyp.name", "w") as f:

        with open("/SNS/PG3/shared/livereduce/tmp/vanback.name", "w") as f:

            f.write(vanback)

        if vanback is not None:

            mantid.logger.information(

reduce_PG3_live_proc.py

+2 −2
Original line number Diff line number Diff line
@@ -89,10 +89,10 @@ else: 


    simpleapi.SaveNexus(

        InputWorkspace=input,

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

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

    

    simpleapi.LoadNexus(

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

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

        OutputWorkspace="proc_in"

    )