Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
ffb3c98e
Commit
ffb3c98e
authored
14 years ago
by
Peterson, Peter
Browse files
Options
Downloads
Patches
Plain Diff
Removed the period list from the parameters since it will never be implemented. Refs #1466.
parent
55b9210b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/DataHandling/inc/MantidDataHandling/LoadEventPreNeXus.h
+0
-1
0 additions, 1 deletion
...d/DataHandling/inc/MantidDataHandling/LoadEventPreNeXus.h
Code/Mantid/DataHandling/src/LoadEventPreNeXus.cpp
+1
-5
1 addition, 5 deletions
Code/Mantid/DataHandling/src/LoadEventPreNeXus.cpp
with
1 addition
and
6 deletions
Code/Mantid/DataHandling/inc/MantidDataHandling/LoadEventPreNeXus.h
+
0
−
1
View file @
ffb3c98e
...
@@ -96,7 +96,6 @@ private:
...
@@ -96,7 +96,6 @@ private:
void
exec
();
void
exec
();
std
::
vector
<
int
>
spectra_list
;
///<the list of Spectra
std
::
vector
<
int
>
spectra_list
;
///<the list of Spectra
std
::
vector
<
int
>
period_list
;
///< the list of periods
/// The times for each pulse.
/// The times for each pulse.
std
::
vector
<
boost
::
posix_time
::
ptime
>
pulsetimes
;
std
::
vector
<
boost
::
posix_time
::
ptime
>
pulsetimes
;
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/DataHandling/src/LoadEventPreNeXus.cpp
+
1
−
5
View file @
ffb3c98e
...
@@ -42,7 +42,6 @@ static const string MAP_PARAM("MappingFilename");
...
@@ -42,7 +42,6 @@ static const string MAP_PARAM("MappingFilename");
static
const
string
INSTRUMENT_PARAM
(
"InstrumentFilename"
);
static
const
string
INSTRUMENT_PARAM
(
"InstrumentFilename"
);
static
const
string
PID_PARAM
(
"SpectrumList"
);
static
const
string
PID_PARAM
(
"SpectrumList"
);
static
const
string
PAD_PIXELS_PARAM
(
"PadEmptyPixels"
);
static
const
string
PAD_PIXELS_PARAM
(
"PadEmptyPixels"
);
static
const
string
PERIOD_PARAM
(
"PeriodList"
);
static
const
string
OUT_PARAM
(
"OutputWorkspace"
);
static
const
string
OUT_PARAM
(
"OutputWorkspace"
);
/// Default number of items to read in from any of the files.
/// Default number of items to read in from any of the files.
...
@@ -100,9 +99,7 @@ void LoadEventPreNeXus::init()
...
@@ -100,9 +99,7 @@ void LoadEventPreNeXus::init()
// which pixels to load
// which pixels to load
this
->
declareProperty
(
new
ArrayProperty
<
int
>
(
PID_PARAM
),
this
->
declareProperty
(
new
ArrayProperty
<
int
>
(
PID_PARAM
),
"A list of individual spectra to read. Only used if set."
);
"A list of individual spectra to read. Only used if set."
);
// which states to load
this
->
declareProperty
(
new
ArrayProperty
<
int
>
(
PERIOD_PARAM
),
"A list of periods to read. Only used if set."
);
// Pad out empty pixels?
// Pad out empty pixels?
this
->
declareProperty
(
new
PropertyWithValue
<
bool
>
(
PAD_PIXELS_PARAM
,
false
,
Direction
::
Input
)
);
this
->
declareProperty
(
new
PropertyWithValue
<
bool
>
(
PAD_PIXELS_PARAM
,
false
,
Direction
::
Input
)
);
// "Set to True to pad empty pixels, loaded from the instrument geometry file. Nothing is done if no geometry file was specified.");
// "Set to True to pad empty pixels, loaded from the instrument geometry file. Nothing is done if no geometry file was specified.");
...
@@ -118,7 +115,6 @@ void LoadEventPreNeXus::exec()
...
@@ -118,7 +115,6 @@ void LoadEventPreNeXus::exec()
{
{
// what to load
// what to load
this
->
spectra_list
=
this
->
getProperty
(
PID_PARAM
);
this
->
spectra_list
=
this
->
getProperty
(
PID_PARAM
);
this
->
period_list
=
this
->
getProperty
(
PERIOD_PARAM
);
// load the mapping file
// load the mapping file
string
mapping_filename
=
this
->
getPropertyValue
(
MAP_PARAM
);
string
mapping_filename
=
this
->
getPropertyValue
(
MAP_PARAM
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment