refactor: do not inline map accessor (#641)

Resolves #620

Co-authored-by: klendathu2k <[email protected]>

Author: plexoos

StarVMC/StarAgmlLib/AgBlock.cxx

@@ -98,6 +98,9 @@ void AgBlock::AddGroup( const Char_t *name )
 ;//{ mGroups.push_back( name ); }
 
 
+void AgBlock::AddCut( TString cut, double value ){ mGstpar[cut] = value; }
+
+
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> WHY IS THIS COMMENTED OUT???
 void AgBlock::Inherit()
 {

StarVMC/StarAgmlLib/AgBlock.h

@@ -153,7 +153,7 @@ class AgBlock : public TNamed
   int numberBranches() const { return mNumberBranches; }
   void branch(){ mNumberBranches++; }
 
-  void AddCut( TString cut, double value ){ mGstpar[cut] = value; }
+  void AddCut( TString cut, double value );
   std::map<TString, double>& GetCuts() { return mGstpar; }
 
  private:

StarVMC/StarAgmlLib/AgMLExtension.cxx

@@ -13,3 +13,5 @@ AgMLExtension::AgMLExtension() : TGeoRCExtension(),
 {
   Grab();
 }
+
+void AgMLExtension::AddCut( TString cut, double value ){ mGstpar[cut] = value; }

StarVMC/StarAgmlLib/AgMLExtension.h

@@ -57,7 +57,7 @@ class AgMLExtension : public TGeoRCExtension {
 
   std::vector<AgMLScoring*> GetUserHits(){ return mHitScoring; }
 
-  void AddCut( TString cut, double value ){ mGstpar[cut] = value; }
+  void AddCut( TString cut, double value );
   std::map<TString,double>& GetCuts() { return mGstpar; }
 
 

StarVMC/StarAgmlLib/AgModule.cxx

@@ -25,6 +25,8 @@ TDataSet *AgModule::Geom()
   else           return mGeomSet;
 };
 
+void AgModule::AddHitScoring( TString name, AgMLScoring* sc ){ mHitScoring[name] = sc; }
+
 // ---------------------------------------------------------------------------------------------
 AgBlock *AgModule::AddBlock( const Char_t *name, AgBlock *_block )
 {

StarVMC/StarAgmlLib/AgModule.h

@@ -40,7 +40,7 @@ class AgModule : public AgBlock
   void SetTrackingFlag( int flag ){ mTrackingFlag = flag; }
   int  GetTrackingFlag(){ return mTrackingFlag; }
 
-  void AddHitScoring( TString name, AgMLScoring* sc ){ mHitScoring[name] = sc; }
+  void AddHitScoring( TString name, AgMLScoring* sc );
   std::map<TString,AgMLScoring*> GetHitScoring(){ return mHitScoring; }
 
  private:

StarVMC/StarAgmlLib/AgShape.cxx

@@ -626,6 +626,8 @@ Bool_t AgShape::morphed()
   return true; // No shapes match
 }
 
+std::vector< TString > &AgShape::parList(){ return mParList[mId]; }
+
 // =============================================================================================================
 Bool_t AgShape::parameterized()
 {

StarVMC/StarAgmlLib/AgShape.h

@@ -67,7 +67,7 @@ class AgShape : public TNamed, public AgParameterList<double>
   Bool_t morphed();
 
   /// Return a list of the parameters which define this shape
-  std::vector< TString > &parList(){ return mParList[mId]; }
+  std::vector< TString > &parList();
 
   /// Returns true if the shape's parameters are to be set
   /// when positioned

StarVMC/StarAgmlLib/StarAgmlStacker.cxx

@@ -129,6 +129,12 @@ TString StarAgmlStacker::realname( TString nname )
   return mRealnames[nname];
 }
 
+
+const std::vector<TString> &StarAgmlStacker::nicknames(const Char_t *name)
+{
+  return mNicknames[ TString(name) ];
+}
+
 // ---------------------------------------------------------------------------------------------------
 void StarAgmlStacker::Debug( const Char_t *name, const Char_t *flag )
 {

StarVMC/StarAgmlLib/StarAgmlStacker.h

@@ -35,10 +35,7 @@ class StarAgmlStacker : public TNamed
 
   virtual Bool_t SearchVolume( const AgShape &shape, const AgAttribute &attr )=0;
 
-  const std::vector<TString> &nicknames(const Char_t *name)
-    {
-      return mNicknames[ TString(name) ];
-    }
+  const std::vector<TString> &nicknames(const Char_t *name);
 
   void Debug( const Char_t *name, const Char_t *flag="position" );