Ticket #8074 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Make calibration file optional in AlignAndFocusPowder

Reported by: Peter Peterson Owned by: Peter Peterson
Priority: major Milestone: Release 3.0
Component: Diffraction Keywords:
Cc: Blocked By:
Blocking: #7987, #8084 Tester: Wenduo Zhou

Description

Allow for the case of only some of the calibration information being specified. This will have the following features:

  • If CalFileName is empty, then skip it
  • If there is no offsets, use ConvertUnits rather than AlignDetectors
  • If there is no grouping, don't run DiffractionFocussing

Change History

comment:1 Changed 7 years ago by Peter Peterson

  • Blocking 7987 added

comment:2 Changed 7 years ago by Peter Peterson

  • Status changed from new to inprogress

Re #8074. Making CalFile optional.

Checks for whether it is empty and not grabbing workspaces. Filled in the check for grouping workspace before diffraction focussing. Also did a bit better checking on CropWorkspaces.

Changeset: 098c601c558bfaf30eb0f268cf58fd1236ab86a1

comment:3 Changed 7 years ago by Peter Peterson

Re #8074. Made MaskDetectors and AlignDetectors optional.

Changeset: 05a5e64f499247916f7d25ffb774ed91549a333e

comment:4 Changed 7 years ago by Peter Peterson

Re #8074. Moving code from header to source.

Changeset: cc3b8843295fafbc6171817c4f0fe48552bce65c

comment:5 Changed 7 years ago by Peter Peterson

Re #8074. Only pass the reqiored arguments to EditInstrGeom.

Changeset: b9b0b830ab450d9243097f5ee7b818e229a8aecf

comment:6 Changed 7 years ago by Peter Peterson

Re #8074. Refactored SetInstrumentGeometry and added a CompressEvents.

Changeset: 19721e14ea52bf0c5fa52f5e19590c6c27332f10

comment:7 Changed 7 years ago by Peter Peterson

Re #8074. Added progress bar AlignAndFocusPowder

Changeset: 581050a8bb4c0961c6d304244b6997a15df8f416

comment:8 Changed 7 years ago by Peter Peterson

  • Status changed from inprogress to verify
  • Resolution set to fixed

This is on feature/8074_alignandfocus.

To test:

  • Load an event file
  • Load a cal file
  • Try different variants of specifying the calibration file (and not) for the various special workspaces

Some parameters to start with:

  • Nexus file: NOM_14526_event.nxs
  • CalFileName=/SNS/NOM/IPTS-8607/shared/NOM_calibrate_d14526_2013_05_18.cal
  • ResampleX=-3000
  • Dspacing=True
  • DMin=.13
  • DMax=31.42
  • TMin=300
  • TMax=16666.67
  • PreserveEvents=True
  • RemovePromptPulseWidth=50
  • L2=2,2,2,2,2,2
  • Polar=15,31,67,122,154,7

comment:9 Changed 7 years ago by Gesner Passos

  • Status changed from verify to verifying
  • Tester set to Gesner Passos

comment:10 Changed 7 years ago by Gesner Passos

  • Status changed from verifying to verify
  • Tester Gesner Passos deleted

I'm afraid I do not have the data files to test this ticket. BTW, I could not find unittest or system test for AlignAndFocusPowder to give me a hint on how to test it.

comment:11 Changed 7 years ago by Peter Peterson

  • Blocking 8084 added

comment:12 Changed 7 years ago by Peter Peterson

#8084 is to make a unit test.

comment:13 Changed 7 years ago by Peter Peterson

  • Tester set to Wenduo Zhou

comment:14 Changed 7 years ago by Wenduo Zhou

  • Status changed from verify to reopened
  • Resolution fixed deleted

The algorithm can execute without neither cal file nor mask/group/offset workspaces. It works for the purpose.

But when there isn't cal file to load or group workspace given, editing instrument geometry should be disabled automatically regardless of the input to geometry related properties such as L2 and 2-theta.

comment:15 Changed 7 years ago by Peter Peterson

  • Status changed from reopened to inprogress

Re #8074. Don't edit instrument without grouping.

Changeset: 3459ea94f491fd971522e5debe34e723a5cf9759

comment:16 Changed 7 years ago by Peter Peterson

  • Status changed from inprogress to verify
  • Resolution set to fixed

comment:17 Changed 7 years ago by Wenduo Zhou

  • Status changed from verify to verifying

comment:18 Changed 7 years ago by Wenduo Zhou

The modification eliminates the bug reported. Thus ticket is closed.

comment:19 Changed 7 years ago by Wenduo Zhou

  • Status changed from verifying to closed

Merge remote-tracking branch 'origin/feature/8074_alignandfocus'

Full changeset: 7ce73e57b243c078e00492c6ef6cddd51480d9c2

comment:20 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 8919

Note: See TracTickets for help on using tickets.