Commit e046d9e4 authored by dauncey's avatar dauncey

Separate root dirs

parent cae5a908
...@@ -52,6 +52,17 @@ public: ...@@ -52,6 +52,17 @@ public:
";Difference in L1Accept numbers",100,0,100); ";Difference in L1Accept numbers",100,0,100);
hL1AcceptDifferenceHistory[block]=new TH1I((sout.str()+"Block"+sHgcroc[block]+"L1AcceptDifferenceHistory").c_str(), hL1AcceptDifferenceHistory[block]=new TH1I((sout.str()+"Block"+sHgcroc[block]+"L1AcceptDifferenceHistory").c_str(),
";BX;Difference in L1Accept numbers",nHistory,0,nHistory); ";BX;Difference in L1Accept numbers",nHistory,0,nHistory);
for(unsigned i(0);i<fEconSim->econArch().fHgcrocNumber[block].size();i++) {
unsigned h(fEconSim->econArch().fHgcrocNumber[block][i]);
hChannels[h]=new TH1D((sout.str()+"Hgcroc"+sHgcroc[h]+"Channels").c_str(),
";Number of channels per HGCROC packet",73,0,73);
hWords[h]=new TH1D((sout.str()+"Hgcroc"+sHgcroc[h]+"Words").c_str(),
";Number of words per HGCROC packet",60,0,60);
hWordsVsChannels[h]=new TH2D((sout.str()+"Hgcroc"+sHgcroc[h]+"WordsVsChannels").c_str(),
";Number of channels per HGCROC packet;Number of words per HGCROC packet",73,-0.5,72.5,60,-0.5,59.5);
}
} }
for(unsigned c(0);c<=72;c++) { for(unsigned c(0);c<=72;c++) {
...@@ -65,41 +76,33 @@ public: ...@@ -65,41 +76,33 @@ public:
for(unsigned h(0);h<fEconSim->econFile().numberOfHgcrocs();h++) { for(unsigned h(0);h<fEconSim->econFile().numberOfHgcrocs();h++) {
hMeans->SetBinContent(h+1,fEconSim->econFile().mean(h)); hMeans->SetBinContent(h+1,fEconSim->econFile().mean(h));
} }
for(unsigned h(0);h<18;h++) {
hChannels[h]=new TH1D((sout.str()+"Hgcroc"+sHgcroc[h]+"Channels").c_str(),
";Number of channels per HGCROC packet",73,0,73);
hWords[h]=new TH1D((sout.str()+"Hgcroc"+sHgcroc[h]+"Words").c_str(),
";Number of words per HGCROC packet",60,0,60);
hWordsVsChannels[h]=new TH2D((sout.str()+"Hgcroc"+sHgcroc[h]+"WordsVsChannels").c_str(),
";Number of channels per HGCROC packet;Number of words per HGCROC packet",73,-0.5,72.5,60,-0.5,59.5);
}
} }
void analyseZs(uint64_t bx) { void analyseZs(uint64_t bx) {
unsigned nChannels(0),nWords(0); unsigned nChannels(0),nWords(0);
for(unsigned h(0);h<18;h++) {
hChannels[h]->Fill(fEconSim->numberOfChannels(h));
hWords[h]->Fill(fEconSim->numberOfWords(h));
hWordsVsChannels[h]->Fill(fEconSim->numberOfChannels(h),fEconSim->numberOfWords(h));
nChannels+=fEconSim->numberOfChannels(h);
nWords+=fEconSim->numberOfWords(h);
}
hTotalChannels->Fill(nChannels);
hTotalWords->Fill(nWords);
for(unsigned block(0);block<fEconSim->econArch().numberOfBlocks();block++) { for(unsigned block(0);block<fEconSim->econArch().numberOfBlocks();block++) {
unsigned nBlockChannels(0),nBlockWords(0); unsigned nBlockChannels(0),nBlockWords(0);
for(unsigned i(0);i<fEconSim->econArch().fHgcrocNumber[block].size();i++) { for(unsigned i(0);i<fEconSim->econArch().fHgcrocNumber[block].size();i++) {
unsigned h(fEconSim->econArch().fHgcrocNumber[block][i]); unsigned h(fEconSim->econArch().fHgcrocNumber[block][i]);
hChannels[h]->Fill(fEconSim->numberOfChannels(h));
hWords[h]->Fill(fEconSim->numberOfWords(h));
hWordsVsChannels[h]->Fill(fEconSim->numberOfChannels(h),fEconSim->numberOfWords(h));
nBlockChannels+=fEconSim->numberOfChannels(h); nBlockChannels+=fEconSim->numberOfChannels(h);
nBlockWords+=fEconSim->numberOfWords(h); nBlockWords+=fEconSim->numberOfWords(h);
nChannels+=fEconSim->numberOfChannels(h);
nWords+=fEconSim->numberOfWords(h);
} }
hBlockTotalChannels[block]->Fill(nBlockChannels); hBlockTotalChannels[block]->Fill(nBlockChannels);
hBlockTotalWords[block]->Fill(nBlockWords); hBlockTotalWords[block]->Fill(nBlockWords);
} }
hTotalChannels->Fill(nChannels);
hTotalWords->Fill(nWords);
} }
void analyseBx(uint64_t bx) { void analyseBx(uint64_t bx) {
......
...@@ -207,7 +207,7 @@ int main(int argc, char* argv[]) { ...@@ -207,7 +207,7 @@ int main(int argc, char* argv[]) {
unsigned l1AcceptRandom(1); unsigned l1AcceptRandom(1);
bool doingEcon(true); bool doingEcon(true);
bool doingBe(doingEcon && true); bool doingBe(doingEcon && false);
// HGCROC // HGCROC
unsigned hgcrocLimit(7); unsigned hgcrocLimit(7);
...@@ -308,11 +308,11 @@ int main(int argc, char* argv[]) { ...@@ -308,11 +308,11 @@ int main(int argc, char* argv[]) {
sout << "_Seconds" << seconds; sout << "_Seconds" << seconds;
std::string sName("DaqDaqBuffer/DaqDaqBuffer"); std::string sName("DaqDaqBuffer");
if(!doingEcon) sName+="_HgcrocOnly"; if(!doingEcon) sName+="_HgcrocOnly/DaqDaqBuffer_HgcrocOnly";
else if(!doingBe) sName+="_HgcrocAndEcon"; else if(!doingBe) sName+="_HgcrocAndEcon/DaqDaqBuffer_HgcrocAndEcon";
else sName+="_FullChain"; else sName+="_FullChain/DaqDaqBuffer_FullChain";
sName+=sout.str(); sName+=sout.str();
......
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