Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
scdaq
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
scouting-demonstrator
scdaq
Commits
b8a8e746
Commit
b8a8e746
authored
2 years ago
by
Thomas Owen James
Browse files
Options
Downloads
Patches
Plain Diff
removed sort of bx numbers and fixed typo in scdaq-calo.conf
parent
f70b121e
Branches
patch-processor-bx-ordering
No related tags found
No related merge requests found
Pipeline
#4488161
passed
2 years ago
Stage: build
Stage: run
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/processor.cc
+1
-1
1 addition, 1 deletion
src/processor.cc
test/config/scdaq-calo.conf
+1
-1
1 addition, 1 deletion
test/config/scdaq-calo.conf
with
2 additions
and
2 deletions
src/processor.cc
+
1
−
1
View file @
b8a8e746
...
...
@@ -281,7 +281,7 @@ void StreamProcessor::process(Slice& input, Slice& out)
LOG
(
WARNING
)
<<
"Orbit trailer error: orbit trailer not found before end of data packet. Packet will be skipped. Orbit trailer error count = "
<<
control
.
orbit_trailer_error_count
;
return
;
}
std
::
sort
(
bx_vect
.
begin
(),
bx_vect
.
end
());
//
std::sort(bx_vect.begin(), bx_vect.end());
if
(
processorType
==
ProcessorType
::
GMT
)
{
meta
=
FillOrbitMuon
(
bx_vect
,
rd_ptr
,
wr_ptr
);
orbitCount
=
meta
.
counts
;
...
...
This diff is collapsed.
Click to expand it.
test/config/scdaq-calo.conf
+
1
−
1
View file @
b8a8e746
...
...
@@ -10,7 +10,7 @@
# "filedma" for reading from file and simulating DMA
# "micronDMA" for PICO driver
#
input
:
fi
t
/
config
/
scdaq
-
calo
.
conf
edma
input
:
fi
l
edma
# Settings for Micron board only
loadBitFile
:
yes
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment