Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

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

Merge branch 'TreeBuilder' into 'preprod'

Add T0 in crystal Tree

See merge request IPNL_GAMMA/narval_emulator!71
parents 529a790b 163f7875
...@@ -75,6 +75,7 @@ void TB_AGATA_CRYSTAL::InitValues() ...@@ -75,6 +75,7 @@ void TB_AGATA_CRYSTAL::InitValues()
} }
memset(SegE, 0, sizeof(SegE)); memset(SegE, 0, sizeof(SegE));
memset(CoreE, 0, sizeof(CoreE)); memset(CoreE, 0, sizeof(CoreE));
memset(CoreT, 0, sizeof(CoreT));
} }
...@@ -97,6 +98,7 @@ void TB_AGATA_CRYSTAL::InitTree() ...@@ -97,6 +98,7 @@ void TB_AGATA_CRYSTAL::InitTree()
} }
fTree->Branch("SegE", SegE, Form("SegE[%d]/F",kNSG)); fTree->Branch("SegE", SegE, Form("SegE[%d]/F",kNSG));
fTree->Branch("CoreE", CoreE, Form("CoreE[%d]/F",kNCC)); fTree->Branch("CoreE", CoreE, Form("CoreE[%d]/F",kNCC));
fTree->Branch("CoreT", CoreT, Form("CoreT[%d]/F",kNCC));
fTree->Branch("CrystalId", &crystalId, "CrystalId/I"); fTree->Branch("CrystalId", &crystalId, "CrystalId/I");
fTree->Branch("CrystalTS", &crystalTS, "CrystalTS/l"); fTree->Branch("CrystalTS", &crystalTS, "CrystalTS/l");
...@@ -128,6 +130,7 @@ void TB_AGATA_CRYSTAL::Process(Int_t idet) ...@@ -128,6 +130,7 @@ void TB_AGATA_CRYSTAL::Process(Int_t idet)
memcpy(&CoreTraces[i*fTraceLenght],data->GetCore(i)->GetSignal()->Address(CoreTraces),sizeof(Float_t)*fTraceLenght); memcpy(&CoreTraces[i*fTraceLenght],data->GetCore(i)->GetSignal()->Address(CoreTraces),sizeof(Float_t)*fTraceLenght);
CoreE[i] = data->GetCore(i)->GetE(); CoreE[i] = data->GetCore(i)->GetE();
CoreT[i] = data->GetCore(i)->GetT();
} }
for (Int_t i = 0; i < kNSG; i++ ) { for (Int_t i = 0; i < kNSG; i++ ) {
...@@ -151,7 +154,6 @@ TB_AGATA_PSA::~TB_AGATA_PSA() = default; ...@@ -151,7 +154,6 @@ TB_AGATA_PSA::~TB_AGATA_PSA() = default;
void TB_AGATA_PSA::Init() void TB_AGATA_PSA::Init()
{ {
ReadTransformation();
} }
void TB_AGATA_PSA::InitValues() void TB_AGATA_PSA::InitValues()
......
...@@ -48,6 +48,7 @@ protected: ...@@ -48,6 +48,7 @@ protected:
Float_t SegE[kNSG]; Float_t SegE[kNSG];
Float_t CoreE[kNCC]; Float_t CoreE[kNCC];
Float_t CoreT[kNCC];
ULong64_t crystalId; ULong64_t crystalId;
ULong64_t crystalTS; ULong64_t crystalTS;
......
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
using namespace AGAPRO; using namespace AGAPRO;
TB_Detector::TB_Detector(TString name, TString ADFKey) : TB_Detector::TB_Detector(TString name, TString ADFKey) :
fName(name), gActualClass("TB_Detector"),
fTriggerName(ADFKey),
Log(Form("Log_%s",name.Data())), Log(Form("Log_%s",name.Data())),
gActualClass("TB_Detector") fName(name),
fTriggerName(ADFKey)
{ {
} }
......
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