Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
LEFEBVREJP email
radix
Commits
b0949d24
Commit
b0949d24
authored
Oct 10, 2018
by
Purves, Murray
Browse files
Changing Spectrum getters to return const std::string&
parent
695afd32
Pipeline
#16214
passed with stages
in 10 minutes and 10 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
radixio/spectrum.cc
View file @
b0949d24
...
@@ -28,7 +28,7 @@ bool Spectrum::dhsVersion() const { return mDhsVersion; }
...
@@ -28,7 +28,7 @@ bool Spectrum::dhsVersion() const { return mDhsVersion; }
void
Spectrum
::
setDhsVersion
(
bool
dhsType
)
{
mDhsVersion
=
dhsType
;
}
void
Spectrum
::
setDhsVersion
(
bool
dhsType
)
{
mDhsVersion
=
dhsType
;
}
std
::
string
Spectrum
::
energyCalibrationLabel
()
const
const
std
::
string
&
Spectrum
::
energyCalibrationLabel
()
const
{
{
return
mEnergyCalibrationLabel
;
return
mEnergyCalibrationLabel
;
}
}
...
@@ -87,7 +87,10 @@ void Spectrum::setEnergyCalibrationLowEnergy(float energyCalibrationLowEnergy)
...
@@ -87,7 +87,10 @@ void Spectrum::setEnergyCalibrationLowEnergy(float energyCalibrationLowEnergy)
mEnergyCalibrationLowEnergy
=
energyCalibrationLowEnergy
;
mEnergyCalibrationLowEnergy
=
energyCalibrationLowEnergy
;
}
}
std
::
string
Spectrum
::
lastModifiedHash
()
const
{
return
mLastModifiedHash
;
}
const
std
::
string
&
Spectrum
::
lastModifiedHash
()
const
{
return
mLastModifiedHash
;
}
void
Spectrum
::
setLastModifiedHash
(
const
std
::
string
&
lastModifiedHash
)
void
Spectrum
::
setLastModifiedHash
(
const
std
::
string
&
lastModifiedHash
)
{
{
...
@@ -98,7 +101,7 @@ std::string Spectrum::uuid() const { return mUuid; }
...
@@ -98,7 +101,7 @@ std::string Spectrum::uuid() const { return mUuid; }
void
Spectrum
::
setUuid
(
const
std
::
string
&
uuid
)
{
mUuid
=
uuid
;
}
void
Spectrum
::
setUuid
(
const
std
::
string
&
uuid
)
{
mUuid
=
uuid
;
}
std
::
string
Spectrum
::
inspection
()
const
{
return
mInspection
;
}
const
std
::
string
&
Spectrum
::
inspection
()
const
{
return
mInspection
;
}
void
Spectrum
::
setInspection
(
const
std
::
string
&
inspection
)
void
Spectrum
::
setInspection
(
const
std
::
string
&
inspection
)
{
{
...
@@ -109,49 +112,58 @@ short Spectrum::laneNumber() const { return mLaneNumber; }
...
@@ -109,49 +112,58 @@ short Spectrum::laneNumber() const { return mLaneNumber; }
void
Spectrum
::
setLaneNumber
(
short
laneNumber
)
{
mLaneNumber
=
laneNumber
;
}
void
Spectrum
::
setLaneNumber
(
short
laneNumber
)
{
mLaneNumber
=
laneNumber
;
}
std
::
string
Spectrum
::
measurementRemark
()
const
{
return
mMeasurementRemark
;
}
const
std
::
string
&
Spectrum
::
measurementRemark
()
const
{
return
mMeasurementRemark
;
}
void
Spectrum
::
setMeasurementRemark
(
const
std
::
string
&
measurementRemark
)
void
Spectrum
::
setMeasurementRemark
(
const
std
::
string
&
measurementRemark
)
{
{
mMeasurementRemark
=
measurementRemark
;
mMeasurementRemark
=
measurementRemark
;
}
}
std
::
string
Spectrum
::
instrumentType
()
const
{
return
mInstrumentType
;
}
const
std
::
string
&
Spectrum
::
instrumentType
()
const
{
return
mInstrumentType
;
}
void
Spectrum
::
setInstrumentType
(
const
std
::
string
&
instrumentType
)
void
Spectrum
::
setInstrumentType
(
const
std
::
string
&
instrumentType
)
{
{
mInstrumentType
=
instrumentType
;
mInstrumentType
=
instrumentType
;
}
}
std
::
string
Spectrum
::
manufacturer
()
const
{
return
mManufacturer
;
}
const
std
::
string
&
Spectrum
::
manufacturer
()
const
{
return
mManufacturer
;
}
void
Spectrum
::
setManufacturer
(
const
std
::
string
&
manufacturer
)
void
Spectrum
::
setManufacturer
(
const
std
::
string
&
manufacturer
)
{
{
mManufacturer
=
manufacturer
;
mManufacturer
=
manufacturer
;
}
}
std
::
string
Spectrum
::
instrumentModel
()
const
{
return
mInstrumentModel
;
}
const
std
::
string
&
Spectrum
::
instrumentModel
()
const
{
return
mInstrumentModel
;
}
void
Spectrum
::
setInstrumentModel
(
const
std
::
string
&
instrumentModel
)
void
Spectrum
::
setInstrumentModel
(
const
std
::
string
&
instrumentModel
)
{
{
mInstrumentModel
=
instrumentModel
;
mInstrumentModel
=
instrumentModel
;
}
}
std
::
string
Spectrum
::
instrumentID
()
const
{
return
mInstrumentID
;
}
const
std
::
string
&
Spectrum
::
instrumentID
()
const
{
return
mInstrumentID
;
}
void
Spectrum
::
setInstrumentID
(
const
std
::
string
&
instrumentID
)
void
Spectrum
::
setInstrumentID
(
const
std
::
string
&
instrumentID
)
{
{
mInstrumentID
=
instrumentID
;
mInstrumentID
=
instrumentID
;
}
}
std
::
string
Spectrum
::
itemDescription
()
const
{
return
mItemDescription
;
}
const
std
::
string
&
Spectrum
::
itemDescription
()
const
{
return
mItemDescription
;
}
void
Spectrum
::
setItemDescription
(
const
std
::
string
&
itemDescription
)
void
Spectrum
::
setItemDescription
(
const
std
::
string
&
itemDescription
)
{
{
mItemDescription
=
itemDescription
;
mItemDescription
=
itemDescription
;
}
}
std
::
string
Spectrum
::
measurementLocationName
()
const
const
std
::
string
&
Spectrum
::
measurementLocationName
()
const
{
{
return
mMeasurementLocationName
;
return
mMeasurementLocationName
;
}
}
...
@@ -162,7 +174,7 @@ void Spectrum::setMeasurementLocationName(
...
@@ -162,7 +174,7 @@ void Spectrum::setMeasurementLocationName(
mMeasurementLocationName
=
measurementLocationName
;
mMeasurementLocationName
=
measurementLocationName
;
}
}
std
::
string
Spectrum
::
measurementLocationCoords
()
const
const
std
::
string
&
Spectrum
::
measurementLocationCoords
()
const
{
{
return
mMeasurementLocationCoords
;
return
mMeasurementLocationCoords
;
}
}
...
@@ -187,14 +199,14 @@ void Spectrum::setOccupancyNumber(short occupancyNumber)
...
@@ -187,14 +199,14 @@ void Spectrum::setOccupancyNumber(short occupancyNumber)
mOccupancyNumber
=
occupancyNumber
;
mOccupancyNumber
=
occupancyNumber
;
}
}
std
::
string
Spectrum
::
cargoType
()
const
{
return
mCargoType
;
}
const
std
::
string
&
Spectrum
::
cargoType
()
const
{
return
mCargoType
;
}
void
Spectrum
::
setCargoType
(
const
std
::
string
&
cargoType
)
void
Spectrum
::
setCargoType
(
const
std
::
string
&
cargoType
)
{
{
mCargoType
=
cargoType
;
mCargoType
=
cargoType
;
}
}
std
::
string
Spectrum
::
deviationPairPresence
()
const
const
std
::
string
&
Spectrum
::
deviationPairPresence
()
const
{
{
return
mDeviationPairPresence
;
return
mDeviationPairPresence
;
}
}
...
...
radixio/spectrum.hh
View file @
b0949d24
...
@@ -28,7 +28,7 @@ class RADIX_PUBLIC Spectrum
...
@@ -28,7 +28,7 @@ class RADIX_PUBLIC Spectrum
short
nrps
()
const
;
short
nrps
()
const
;
bool
dhsVersion
()
const
;
bool
dhsVersion
()
const
;
void
setDhsVersion
(
bool
dhsVersion
);
void
setDhsVersion
(
bool
dhsVersion
);
std
::
string
energyCalibrationLabel
()
const
;
const
std
::
string
&
energyCalibrationLabel
()
const
;
void
setEnergyCalibrationLabel
(
const
std
::
string
&
energyCalibrationLabel
);
void
setEnergyCalibrationLabel
(
const
std
::
string
&
energyCalibrationLabel
);
float
energyCalibrationOffset
()
const
;
float
energyCalibrationOffset
()
const
;
void
setEnergyCalibrationOffset
(
float
energyCalibrationOffset
);
void
setEnergyCalibrationOffset
(
float
energyCalibrationOffset
);
...
@@ -40,38 +40,38 @@ class RADIX_PUBLIC Spectrum
...
@@ -40,38 +40,38 @@ class RADIX_PUBLIC Spectrum
void
setEnergyCalibrationCubicTerm
(
float
energyCalibrationCubicTerm
);
void
setEnergyCalibrationCubicTerm
(
float
energyCalibrationCubicTerm
);
float
energyCalibrationLowEnergy
()
const
;
float
energyCalibrationLowEnergy
()
const
;
void
setEnergyCalibrationLowEnergy
(
float
energyCalibrationLowEnergy
);
void
setEnergyCalibrationLowEnergy
(
float
energyCalibrationLowEnergy
);
std
::
string
lastModifiedHash
()
const
;
const
std
::
string
&
lastModifiedHash
()
const
;
void
setLastModifiedHash
(
const
std
::
string
&
lastModifiedHash
);
void
setLastModifiedHash
(
const
std
::
string
&
lastModifiedHash
);
std
::
string
uuid
()
const
;
std
::
string
uuid
()
const
;
void
setUuid
(
const
std
::
string
&
uuid
);
void
setUuid
(
const
std
::
string
&
uuid
);
std
::
string
inspection
()
const
;
const
std
::
string
&
inspection
()
const
;
void
setInspection
(
const
std
::
string
&
inspection
);
void
setInspection
(
const
std
::
string
&
inspection
);
short
laneNumber
()
const
;
short
laneNumber
()
const
;
void
setLaneNumber
(
short
laneNumber
);
void
setLaneNumber
(
short
laneNumber
);
std
::
string
measurementRemark
()
const
;
const
std
::
string
&
measurementRemark
()
const
;
void
setMeasurementRemark
(
const
std
::
string
&
measurementRemark
);
void
setMeasurementRemark
(
const
std
::
string
&
measurementRemark
);
std
::
string
instrumentType
()
const
;
const
std
::
string
&
instrumentType
()
const
;
void
setInstrumentType
(
const
std
::
string
&
instrumentType
);
void
setInstrumentType
(
const
std
::
string
&
instrumentType
);
std
::
string
manufacturer
()
const
;
const
std
::
string
&
manufacturer
()
const
;
void
setManufacturer
(
const
std
::
string
&
manufacturer
);
void
setManufacturer
(
const
std
::
string
&
manufacturer
);
std
::
string
instrumentModel
()
const
;
const
std
::
string
&
instrumentModel
()
const
;
void
setInstrumentModel
(
const
std
::
string
&
instrumentModel
);
void
setInstrumentModel
(
const
std
::
string
&
instrumentModel
);
std
::
string
instrumentID
()
const
;
const
std
::
string
&
instrumentID
()
const
;
void
setInstrumentID
(
const
std
::
string
&
instrumentID
);
void
setInstrumentID
(
const
std
::
string
&
instrumentID
);
std
::
string
itemDescription
()
const
;
const
std
::
string
&
itemDescription
()
const
;
void
setItemDescription
(
const
std
::
string
&
itemDescription
);
void
setItemDescription
(
const
std
::
string
&
itemDescription
);
std
::
string
measurementLocationName
()
const
;
const
std
::
string
&
measurementLocationName
()
const
;
void
setMeasurementLocationName
(
const
std
::
string
&
measurementLocationName
);
void
setMeasurementLocationName
(
const
std
::
string
&
measurementLocationName
);
std
::
string
measurementLocationCoords
()
const
;
const
std
::
string
&
measurementLocationCoords
()
const
;
void
setMeasurementLocationCoords
(
void
setMeasurementLocationCoords
(
const
std
::
string
&
measurementLocationCoords
);
const
std
::
string
&
measurementLocationCoords
);
short
itemDetectorDistance
()
const
;
short
itemDetectorDistance
()
const
;
void
setItemDetectorDistance
(
short
itemDetectorDistance
);
void
setItemDetectorDistance
(
short
itemDetectorDistance
);
short
occupancyNumber
()
const
;
short
occupancyNumber
()
const
;
void
setOccupancyNumber
(
short
occupancyNumber
);
void
setOccupancyNumber
(
short
occupancyNumber
);
std
::
string
cargoType
()
const
;
const
std
::
string
&
cargoType
()
const
;
void
setCargoType
(
const
std
::
string
&
cargoType
);
void
setCargoType
(
const
std
::
string
&
cargoType
);
std
::
string
deviationPairPresence
()
const
;
const
std
::
string
&
deviationPairPresence
()
const
;
void
setDeviationPairPresence
(
const
std
::
string
&
deviationPairPresence
);
void
setDeviationPairPresence
(
const
std
::
string
&
deviationPairPresence
);
std
::
array
<
std
::
array
<
std
::
array
<
std
::
array
<
float
,
4
>
,
8
>
,
8
>
,
20
>
std
::
array
<
std
::
array
<
std
::
array
<
std
::
array
<
float
,
4
>
,
8
>
,
8
>
,
20
>
deviationPairEnergies
()
const
;
deviationPairEnergies
()
const
;
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment