Skip to content
Snippets Groups Projects
Commit 657015be authored by Thomas Owen James's avatar Thomas Owen James :speech_balloon:
Browse files

doZS bug fix

parent 103e0408
No related branches found
No related tags found
1 merge request!59CMSSW json file
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
#include "slice.h" #include "slice.h"
#include "log.h" #include "log.h"
StreamProcessor::StreamProcessor(size_t max_size_, bool noZS_) : StreamProcessor::StreamProcessor(size_t max_size_, bool doZS_) :
tbb::filter(parallel), tbb::filter(parallel),
max_size(max_size_), max_size(max_size_),
nbPackets(0), nbPackets(0),
noZS(noZS_) doZS(doZS_)
{ {
LOG(TRACE) << "Created transform filter at " << static_cast<void*>(this); LOG(TRACE) << "Created transform filter at " << static_cast<void*>(this);
} }
...@@ -61,13 +61,13 @@ Slice* StreamProcessor::process(Slice& input, Slice& out) ...@@ -61,13 +61,13 @@ Slice* StreamProcessor::process(Slice& input, Slice& out)
uint32_t orbit = bl->orbit[i]; uint32_t orbit = bl->orbit[i];
orbitmatch += (orbit==bl->orbit[0])<<i; orbitmatch += (orbit==bl->orbit[0])<<i;
uint32_t pt = (bl->mu1f[i] >> shifts::pt) & masks::pt; uint32_t pt = (bl->mu1f[i] >> shifts::pt) & masks::pt;
AblocksOn[i]=(pt>0 || noZS); AblocksOn[i]=(pt>0 || (doZS==0));
if(pt>0){ if(pt>0 || (doZS==0)){
mAcount++; mAcount++;
} }
pt = (bl->mu2f[i] >> shifts::pt) & masks::pt; pt = (bl->mu2f[i] >> shifts::pt) & masks::pt;
BblocksOn[i]=(pt>0 || noZS); BblocksOn[i]=(pt>0 || (doZS==0));
if(pt>0){ if(pt>0 || (doZS==0)){
mBcount++; mBcount++;
} }
} }
......
...@@ -19,7 +19,7 @@ private: ...@@ -19,7 +19,7 @@ private:
private: private:
size_t max_size; size_t max_size;
uint64_t nbPackets; uint64_t nbPackets;
bool noZS; bool doZS;
}; };
#endif #endif
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