Changing Spectrum getters to return const std::string&

radixio/spectrum.cc

@@ -28,7 +28,7 @@ bool Spectrum::dhsVersion() const { return mDhsVersion; }
 
 void Spectrum::setDhsVersion(bool dhsType) { mDhsVersion = dhsType; }
 
-std::string Spectrum::energyCalibrationLabel() const
+const std::string &Spectrum::energyCalibrationLabel() const
 {
   return mEnergyCalibrationLabel;
 }
@@ -87,7 +87,10 @@ void Spectrum::setEnergyCalibrationLowEnergy(float 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)
 {
@@ -98,7 +101,7 @@ std::string Spectrum::uuid() const { return mUuid; }
 
 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)
 {
@@ -109,49 +112,58 @@ short Spectrum::laneNumber() const { return mLaneNumber; }
 
 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)
 {
   mMeasurementRemark = measurementRemark;
 }
 
-std::string Spectrum::instrumentType() const { return mInstrumentType; }
+const std::string &Spectrum::instrumentType() const { return mInstrumentType; }
 
 void Spectrum::setInstrumentType(const std::string &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)
 {
   mManufacturer = manufacturer;
 }
 
-std::string Spectrum::instrumentModel() const { return mInstrumentModel; }
+const std::string &Spectrum::instrumentModel() const
+{
+  return mInstrumentModel;
+}
 
 void Spectrum::setInstrumentModel(const std::string &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)
 {
   mInstrumentID = instrumentID;
 }
 
-std::string Spectrum::itemDescription() const { return mItemDescription; }
+const std::string &Spectrum::itemDescription() const
+{
+  return mItemDescription;
+}
 
 void Spectrum::setItemDescription(const std::string &itemDescription)
 {
   mItemDescription = itemDescription;
 }
 
-std::string Spectrum::measurementLocationName() const
+const std::string &Spectrum::measurementLocationName() const
 {
   return mMeasurementLocationName;
 }
@@ -162,7 +174,7 @@ void Spectrum::setMeasurementLocationName(
   mMeasurementLocationName = measurementLocationName;
 }
 
-std::string Spectrum::measurementLocationCoords() const
+const std::string &Spectrum::measurementLocationCoords() const
 {
   return mMeasurementLocationCoords;
 }
@@ -187,14 +199,14 @@ void Spectrum::setOccupancyNumber(short 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)
 {
   mCargoType = cargoType;
 }
 
-std::string Spectrum::deviationPairPresence() const
+const std::string &Spectrum::deviationPairPresence() const
 {
   return mDeviationPairPresence;
 }

radixio/spectrum.hh

@@ -28,7 +28,7 @@ class RADIX_PUBLIC Spectrum
   short nrps() const;
   bool dhsVersion() const;
   void setDhsVersion(bool dhsVersion);
-  std::string energyCalibrationLabel() const;
+  const std::string &energyCalibrationLabel() const;
   void setEnergyCalibrationLabel(const std::string &energyCalibrationLabel);
   float energyCalibrationOffset() const;
   void setEnergyCalibrationOffset(float energyCalibrationOffset);
@@ -40,38 +40,38 @@ class RADIX_PUBLIC Spectrum
   void setEnergyCalibrationCubicTerm(float energyCalibrationCubicTerm);
   float energyCalibrationLowEnergy() const;
   void setEnergyCalibrationLowEnergy(float energyCalibrationLowEnergy);
-  std::string lastModifiedHash() const;
+  const std::string &lastModifiedHash() const;
   void setLastModifiedHash(const std::string &lastModifiedHash);
   std::string uuid() const;
   void setUuid(const std::string &uuid);
-  std::string inspection() const;
+  const std::string &inspection() const;
   void setInspection(const std::string &inspection);
   short laneNumber() const;
   void setLaneNumber(short laneNumber);
-  std::string measurementRemark() const;
+  const std::string &measurementRemark() const;
   void setMeasurementRemark(const std::string &measurementRemark);
-  std::string instrumentType() const;
+  const std::string &instrumentType() const;
   void setInstrumentType(const std::string &instrumentType);
-  std::string manufacturer() const;
+  const std::string &manufacturer() const;
   void setManufacturer(const std::string &manufacturer);
-  std::string instrumentModel() const;
+  const std::string &instrumentModel() const;
   void setInstrumentModel(const std::string &instrumentModel);
-  std::string instrumentID() const;
+  const std::string &instrumentID() const;
   void setInstrumentID(const std::string &instrumentID);
-  std::string itemDescription() const;
+  const std::string &itemDescription() const;
   void setItemDescription(const std::string &itemDescription);
-  std::string measurementLocationName() const;
+  const std::string &measurementLocationName() const;
   void setMeasurementLocationName(const std::string &measurementLocationName);
-  std::string measurementLocationCoords() const;
+  const std::string &measurementLocationCoords() const;
   void setMeasurementLocationCoords(
       const std::string &measurementLocationCoords);
   short itemDetectorDistance() const;
   void setItemDetectorDistance(short itemDetectorDistance);
   short occupancyNumber() const;
   void setOccupancyNumber(short occupancyNumber);
-  std::string cargoType() const;
+  const std::string &cargoType() const;
   void setCargoType(const std::string &cargoType);
-  std::string deviationPairPresence() const;
+  const std::string &deviationPairPresence() const;
   void setDeviationPairPresence(const std::string &deviationPairPresence);
   std::array<std::array<std::array<std::array<float, 4>, 8>, 8>, 20>
   deviationPairEnergies() const;