Commit f957b3ef authored by Jérémie Dudouet's avatar Jérémie Dudouet
Browse files

Merge branch 'current_dev' into 'preprod'

Current dev

See merge request IPNL_GAMMA/narval_emulator!42
parents fab08d45 023bec04
...@@ -70,6 +70,7 @@ void TB_NEDA::InitTree() ...@@ -70,6 +70,7 @@ void TB_NEDA::InitTree()
fTree->Branch("NEDAId", NEDAId, "NEDAId[nbNEDA]/s" ); fTree->Branch("NEDAId", NEDAId, "NEDAId[nbNEDA]/s" );
fTree->Branch("NEDATdc", NEDATdc, "NEDATdc[nbNEDA]/s" ); fTree->Branch("NEDATdc", NEDATdc, "NEDATdc[nbNEDA]/s" );
fTree->Branch("NEDAEnergy", NEDAEnergy, "NEDAEnergy[nbNEDA]/s" );
fTree->Branch("NEDAFast", NEDAFast, "NEDAFast[nbNEDA]/s" ); fTree->Branch("NEDAFast", NEDAFast, "NEDAFast[nbNEDA]/s" );
fTree->Branch("NEDASlow", NEDASlow, "NEDASlow[nbNEDA]/s" ); fTree->Branch("NEDASlow", NEDASlow, "NEDASlow[nbNEDA]/s" );
fTree->Branch("NEDAZco", NEDAZco, "NEDAZco[nbNEDA]/s" ); fTree->Branch("NEDAZco", NEDAZco, "NEDAZco[nbNEDA]/s" );
...@@ -113,6 +114,7 @@ void TB_NEDA::Process(Int_t idet) ...@@ -113,6 +114,7 @@ void TB_NEDA::Process(Int_t idet)
NEDAId[i] = fLookUpTable[NEDABoardId[i]*MaxChannel+NEDAChannelId[i]]; NEDAId[i] = fLookUpTable[NEDABoardId[i]*MaxChannel+NEDAChannelId[i]];
NEDATdc[i] = fNEDAFrame->GetTdcCorValue(); NEDATdc[i] = fNEDAFrame->GetTdcCorValue();
NEDAEnergy[i] = fNEDAFrame->GetEnergy();
NEDAFast[i] = fNEDAFrame->GetFastIntegral(); NEDAFast[i] = fNEDAFrame->GetFastIntegral();
NEDASlow[i] = fNEDAFrame->GetSlowIntegral(); NEDASlow[i] = fNEDAFrame->GetSlowIntegral();
NEDAZco[i] = fNEDAFrame->GetNbZero(); NEDAZco[i] = fNEDAFrame->GetNbZero();
......
...@@ -39,7 +39,7 @@ protected: ...@@ -39,7 +39,7 @@ protected:
Int_t nbNEDA; Int_t nbNEDA;
UShort_t NEDABoardId[MaxNEDA], NEDAChannelId[MaxNEDA], NEDAId[MaxNEDA]; UShort_t NEDABoardId[MaxNEDA], NEDAChannelId[MaxNEDA], NEDAId[MaxNEDA];
UShort_t NEDATdc[MaxNEDA], NEDAFast[MaxNEDA], NEDASlow[MaxNEDA] ,NEDAZco[MaxNEDA], NEDATime[MaxNEDA]; UShort_t NEDATdc[MaxNEDA], NEDAEnergy[MaxNEDA], NEDAFast[MaxNEDA], NEDASlow[MaxNEDA] ,NEDAZco[MaxNEDA], NEDATime[MaxNEDA];
ULong64_t TSNEDAHit[MaxNEDA]; ULong64_t TSNEDAHit[MaxNEDA];
ULong64_t TSNEDA; ULong64_t TSNEDA;
UShort_t NEDANeural[MaxNEDA]; UShort_t NEDANeural[MaxNEDA];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment