Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nibble per lumisection from TCDS FED and transferPSet update (73X) #8153

Merged
merged 3 commits into from Mar 10, 2015
Merged

Nibble per lumisection from TCDS FED and transferPSet update (73X) #8153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d581587
nibbles per LS in TCDS FED
smorovic Mar 9, 2015
813529b
*remove parsing "default" stream case in transferPSet which will be d…
smorovic Mar 9, 2015
2677249
changing variable name in the test
smorovic Mar 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion EventFilter/FEDInterface/interface/FED1024.h
View file
Open in desktop
Expand Up @@ -62,7 +62,7 @@ namespace evf{
uint32_t activePartitions1;
uint32_t nibble;
uint32_t lumiSection;
uint16_t reserved3;
uint16_t nibblesPerLumiSection;
uint16_t reserved4;
uint16_t reserved5;
uint16_t inputs;
Expand Down
4 changes: 2 additions & 2 deletions EventFilter/Utilities/plugins/testGlobalNumbers.cc
View file
Open in desktop
Expand Up @@ -133,8 +133,8 @@ namespace test{
std::cout << "lumiSection; "
<< dec << (unsigned int)record.getHeader().getData().header.lumiSection;
std::cout << "\n";
std::cout << "reserved3; "
<< hex <<(unsigned int)record.getHeader().getData().header.reserved3;
std::cout << "nibblesPerLumiSection"
<< hex <<(unsigned int)record.getHeader().getData().header.nibblesPerLumiSection;
std::cout << "\n";
std::cout << "reserved4; "
<< hex <<(unsigned int)record.getHeader().getData().header. reserved4;
Expand Down
17 changes: 7 additions & 10 deletions EventFilter/Utilities/src/EvFDaqDirector.cc
View file
Open in desktop
Expand Up @@ -881,17 +881,14 @@ namespace evf {
std::string streamRequestName;
if (transferSystemJson_->isMember(stream.c_str()))
streamRequestName = stream;
else {
if (transferSystemJson_->isMember("default"))
streamRequestName = "default";
else {
std::stringstream msg;
msg << "Transfer system mode definitions missing for -: " << stream;
if (requireTSPSet_)
throw cms::Exception("EvFDaqDirector") << msg.str();
else {
std::stringstream msg;
msg << "Transfer system mode definitions missing for -: " << stream;
if (requireTSPSet_)
throw cms::Exception("EvFDaqDirector") << msg.str();
else
edm::LogWarning("EvFDaqDirector") << msg.str() << " (permissive mode)";
return std::string();
edm::LogWarning("EvFDaqDirector") << msg.str() << " (permissive mode)";
return std::string();
}
}
//return empty if strict check parameter is not on
Expand Down