Skip to content
Snippets Groups Projects
Commit 76676049 authored by Alexandru Bercuci's avatar Alexandru Bercuci Committed by Florian Uhlig
Browse files

Fix error in ASIC par creation

parent 7bd7d973
Branches nighly_master
No related tags found
1 merge request!1664fix error in ASIC par creation
Pipeline #27560 passed
...@@ -127,16 +127,17 @@ InitStatus CbmTrdParManager::Init() ...@@ -127,16 +127,17 @@ InitStatus CbmTrdParManager::Init()
} }
} }
} }
Finish();
return kSUCCESS; return kSUCCESS;
} }
void CbmTrdParManager::Finish() void CbmTrdParManager::Finish()
{ {
printf("CbmTrdParManager::Finish()\n");
FairRuntimeDb* rtdb = FairRunAna::Instance()->GetRuntimeDb(); FairRuntimeDb* rtdb = FairRunAna::Instance()->GetRuntimeDb();
// fDigiPar = (CbmTrdParSetDigi*) (rtdb->getContainer("CbmTrdParSetDigi")); fDigiPar = (CbmTrdParSetDigi*) (rtdb->getContainer("CbmTrdParSetDigi"));
// fDigiPar->print(); fAsicPar = (CbmTrdParSetAsic*) (rtdb->getContainer("CbmTrdParSetAsic"));
fAsicPar = (CbmTrdParSetAsic*) (rtdb->getContainer("CbmTrdParSetAsic")); fDigiPar->Print();
fAsicPar->Print(); fAsicPar->Print();
} }
...@@ -303,8 +304,7 @@ void CbmTrdParManager::CreateModuleParameters(const TString& path) ...@@ -303,8 +304,7 @@ void CbmTrdParManager::CreateModuleParameters(const TString& path)
asics->SetAsicPar(asic); asics->SetAsicPar(asic);
} }
} }
asics->SetModuleId(moduleAddress);
asics->Print(); asics->Print();
fAsicPar->addParam(asics); fAsicPar->addParam(asics);
......
...@@ -83,4 +83,14 @@ void CbmTrdParSet::addParam(CbmTrdParMod* mod) ...@@ -83,4 +83,14 @@ void CbmTrdParSet::addParam(CbmTrdParMod* mod)
fNrOfModules++; fNrOfModules++;
} }
//_______________________________________________________________________________
void CbmTrdParSet::Print(Option_t* opt) const
{
printf(" %s Modules[%d]\n", GetName(), fNrOfModules);
for (auto imod : fModuleMap) {
printf(" %d %s(%s)\n", imod.first, imod.second->GetName(), imod.second->GetTitle());
imod.second->Print(opt);
}
}
ClassImp(CbmTrdParSet) ClassImp(CbmTrdParSet)
...@@ -40,8 +40,9 @@ public: ...@@ -40,8 +40,9 @@ public:
virtual void addParam(CbmTrdParMod* mod); virtual void addParam(CbmTrdParMod* mod);
virtual Bool_t getParams(FairParamList*); virtual Bool_t getParams(FairParamList*);
virtual void putParams(FairParamList*); virtual void putParams(FairParamList*);
virtual void Print(Option_t* opt = "") const;
protected: protected:
Int_t fNrOfModules; ///< no of modules in the current run Int_t fNrOfModules; ///< no of modules in the current run
/** Map of parameters for each TRD Module organized as function of Module unique Id **/ /** Map of parameters for each TRD Module organized as function of Module unique Id **/
std::map<Int_t, CbmTrdParMod*> fModuleMap; std::map<Int_t, CbmTrdParMod*> fModuleMap;
......
...@@ -207,15 +207,4 @@ void CbmTrdParSetAsic::putParams(FairParamList* l) ...@@ -207,15 +207,4 @@ void CbmTrdParSetAsic::putParams(FairParamList* l)
} }
} }
//_______________________________________________________________________________
void CbmTrdParSetAsic::Print(Option_t* opt) const
{
printf(" %s Modules[%d]\n", GetName(), fNrOfModules);
for (auto imod : fModuleMap) {
printf(" %d %s(%s)\n", imod.first, imod.second->GetName(), imod.second->GetTitle());
imod.second->Print(opt);
}
}
ClassImp(CbmTrdParSetAsic) ClassImp(CbmTrdParSetAsic)
...@@ -53,9 +53,6 @@ public: ...@@ -53,9 +53,6 @@ public:
* \param module ASICs par (FASP or SPADIC) * \param module ASICs par (FASP or SPADIC)
*/ */
void putParams(FairParamList*); void putParams(FairParamList*);
virtual void Print(Option_t* opt = "") const;
private: private:
CbmTrdParSetAsic(const CbmTrdParSetAsic& ref); CbmTrdParSetAsic(const CbmTrdParSetAsic& ref);
const CbmTrdParSetAsic& operator=(const CbmTrdParSetAsic& ref); const CbmTrdParSetAsic& operator=(const CbmTrdParSetAsic& ref);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment