Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
Project Juggler
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
16
Issues
16
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
EIC
Project Juggler
Commits
61b13e13
Commit
61b13e13
authored
Oct 26, 2020
by
Whitney Armstrong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
eicd updates
- Fixed algos which are affected by changes in eicd.
parent
661a9c7c
Pipeline
#4668
passed with stage
in 4 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
12 deletions
+35
-12
.gitlab-ci.yml
.gitlab-ci.yml
+22
-1
JugReco/src/components/EMCalReconstruction.cpp
JugReco/src/components/EMCalReconstruction.cpp
+2
-1
JugReco/src/components/TrackerHitReconstruction.cpp
JugReco/src/components/TrackerHitReconstruction.cpp
+5
-4
JugReco/src/components/TrackerSourceLinker.cpp
JugReco/src/components/TrackerSourceLinker.cpp
+3
-3
containers/docker/Dockerfile
containers/docker/Dockerfile
+3
-3
No files found.
.gitlab-ci.yml
View file @
61b13e13
...
...
@@ -6,14 +6,29 @@ default:
-
build/
stages
:
#
- build
-
build
-
docker_build
-
docker_push
-
run
compile
:
stage
:
build
rules
:
-
if
:
'
$CI_COMMIT_BRANCH
!=
"master"'
tags
:
-
silicon
script
:
-
export homedir=$(pwd) && pwd && cd /tmp && git clone --depth=1 https://eicweb.phy.anl.gov/EIC/NPDet.git && mkdir build && cd build && cmake ../NPDet/. && make -j20 install
-
cd /tmp && git clone --depth=1 https://eicweb.phy.anl.gov/EIC/eicd.git && mkdir eicd_build && cd eicd_build && cmake ../eicd/. && make -j20 install
-
cd $homedir && ls -lrth && mkdir build && cd build && cmake .. && make -j10
docker_image
:
image
:
eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
stage
:
docker_build
rules
:
-
if
:
'
$CI_PIPELINE_SOURCE
==
"merge_request_event"'
when
:
never
# - if: '$CI_COMMIT_BRANCH == "master"'
tags
:
-
silicon
script
:
...
...
@@ -23,6 +38,12 @@ docker_image:
docker_image_push
:
image
:
eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
stage
:
docker_push
rules
:
-
if
:
'
$CI_PIPELINE_SOURCE
==
"merge_request_event"'
when
:
never
-
if
:
'
$CI_COMMIT_BRANCH
!=
"master"'
when
:
never
-
when
:
on_success
tags
:
-
silicon
script
:
...
...
JugReco/src/components/EMCalReconstruction.cpp
View file @
61b13e13
...
...
@@ -11,6 +11,7 @@
#include "DDRec/CellIDPositionConverter.h"
#include "DDRec/SurfaceManager.h"
#include "DDRec/Surface.h"
#include "DD4hep/DD4hepUnits.h"
// FCCSW
#include "JugBase/DataHandle.h"
...
...
@@ -76,7 +77,7 @@ namespace Jug::Reco {
// cell dimension
auto
dim
=
m_geoSvc
->
cellIDPositionConverter
()
->
cellDimensions
(
id
);
hits
.
push_back
(
eic
::
CalorimeterHit
{
id
,
energy
,
time
,
{
gpos
.
x
()
,
gpos
.
y
(),
gpos
.
z
()},
{
pos
.
x
(),
pos
.
y
(),
pos
.
z
()},
{
dim
[
0
],
dim
[
1
]
,
0.0
},
0
});
id
,
energy
,
time
,
{
gpos
.
x
()
/
dd4hep
::
mm
,
gpos
.
y
()
/
dd4hep
::
mm
,
gpos
.
z
()
/
dd4hep
::
mm
},
{
pos
.
x
()
/
dd4hep
::
mm
,
pos
.
y
()
/
dd4hep
::
mm
,
pos
.
z
()
/
dd4hep
::
mm
},
{
dim
[
0
]
/
dd4hep
::
mm
,
dim
[
1
]
/
dd4hep
::
mm
,
0.0
},
0
});
}
}
...
...
JugReco/src/components/TrackerHitReconstruction.cpp
View file @
61b13e13
...
...
@@ -11,6 +11,7 @@
#include "DDRec/CellIDPositionConverter.h"
#include "DDRec/SurfaceManager.h"
#include "DDRec/Surface.h"
#include "DD4hep/DD4hepUnits.h"
#include "JugBase/DataHandle.h"
#include "JugBase/IGeoSvc.h"
...
...
@@ -81,11 +82,11 @@ namespace Jug {
//std::array<double,3> dimarr; dim.GetCoordinates(posarr);
//eic::TrackerHit hit;
eic
::
TrackerHit
hit
((
long
long
)
ahit
.
cellID
(),
(
long
long
)
ahit
.
time
()
/
1000
,
// ps
(
float
)
ahit
.
charge
()
/
1000.0
,
// MeV
(
float
)
ahit
.
time
()
/
1000
,
// ps
(
float
)
ahit
.
charge
()
/
1.0e6
,
// MeV
(
float
)
0.0
,
{
{
pos
.
x
()
/
dd4hep
::
mm
,
pos
.
y
()
/
dd4hep
::
mm
,
pos
.
z
()
/
dd4hep
::
mm
}
},
{
{
dim
[
0
]
/
dd4hep
::
mm
,
dim
[
1
]
/
dd4hep
::
mm
,
0.0
}
});
{
pos
.
x
()
/
dd4hep
::
mm
,
pos
.
y
()
/
dd4hep
::
mm
,
pos
.
z
()
/
dd4hep
::
mm
},
{
dim
[
0
],
dim
[
1
],
0.0
});
rec_hits
->
push_back
(
hit
);
}
return
StatusCode
::
SUCCESS
;
...
...
JugReco/src/components/TrackerSourceLinker.cpp
View file @
61b13e13
...
...
@@ -95,8 +95,8 @@ namespace Jug::Reco {
for
(
const
auto
&
ahit
:
*
hits
)
{
Acts
::
BoundMatrix
cov
=
Acts
::
BoundMatrix
::
Zero
();
cov
(
Acts
::
eBoundLoc0
,
Acts
::
eBoundLoc0
)
=
ahit
.
cov
Matrix
(
0
)
*
Acts
::
UnitConstants
::
mm
*
ahit
.
covMatrix
(
0
)
*
Acts
::
UnitConstants
::
mm
;
cov
(
Acts
::
eBoundLoc1
,
Acts
::
eBoundLoc1
)
=
ahit
.
cov
Matrix
(
1
)
*
Acts
::
UnitConstants
::
mm
*
ahit
.
covMatrix
(
1
)
*
Acts
::
UnitConstants
::
mm
;
cov
(
Acts
::
eBoundLoc0
,
Acts
::
eBoundLoc0
)
=
ahit
.
cov
sym_xx
()
*
Acts
::
UnitConstants
::
mm
*
ahit
.
covsym_xx
(
)
*
Acts
::
UnitConstants
::
mm
;
cov
(
Acts
::
eBoundLoc1
,
Acts
::
eBoundLoc1
)
=
ahit
.
cov
sym_yy
()
*
Acts
::
UnitConstants
::
mm
*
ahit
.
covsym_yy
(
)
*
Acts
::
UnitConstants
::
mm
;
auto
vol_ctx
=
m_geoSvc
->
cellIDPositionConverter
()
->
findContext
(
ahit
.
cellID
());
auto
vol_id
=
vol_ctx
->
identifier
;
...
...
@@ -117,7 +117,7 @@ namespace Jug::Reco {
// transform global position into local coordinates
Acts
::
Vector2D
pos
(
0
,
0
);
// geometry context contains nothing here
pos
=
surface
->
globalToLocal
(
Acts
::
GeometryContext
(),
{
ahit
.
position
(
0
),
ahit
.
position
(
1
),
ahit
.
position
(
2
)},
{
0
,
0
,
0
}).
value
();
//, pos);
pos
=
surface
->
globalToLocal
(
Acts
::
GeometryContext
(),
{
ahit
.
x
(),
ahit
.
y
(),
ahit
.
z
(
)},
{
0
,
0
,
0
}).
value
();
//, pos);
//// smear truth to create local measurement
Acts
::
BoundVector
loc
=
Acts
::
BoundVector
::
Zero
();
...
...
containers/docker/Dockerfile
View file @
61b13e13
...
...
@@ -11,21 +11,21 @@ LABEL maintainer="Whitney Armstrong <warmstrong@anl.gov>" \
RUN
cd
/tmp
\
&&
git clone https://eicweb.phy.anl.gov/EIC/NPDet.git
\
&&
mkdir
-p
NPDet/build
&&
cd
NPDet/build
\
&&
cmake ../.
-DCMAKE_CXX_STANDARD
=
17
-DCMAKE_INSTALL_PREFIX
=
/usr/local
\
&&
cmake ../.
-DCMAKE_CXX_STANDARD
=
20
-DCMAKE_INSTALL_PREFIX
=
/usr/local
\
&&
make
-j30
&&
make
-j4
install
\
&&
cd
/tmp
&&
rm
-rf
/tmp/NPDet
RUN
cd
/tmp
\
&&
git clone https://eicweb.phy.anl.gov/EIC/eicd.git
\
&&
mkdir
-p
eicd/build
&&
cd
eicd/build
\
&&
cmake ../.
-DCMAKE_CXX_STANDARD
=
17
-DCMAKE_INSTALL_PREFIX
=
/usr/local
\
&&
cmake ../.
-DCMAKE_CXX_STANDARD
=
20
-DCMAKE_INSTALL_PREFIX
=
/usr/local
\
&&
make
-j30
&&
make
-j4
install
\
&&
cd
/tmp
&&
rm
-rf
/tmp/eicd
RUN
cd
/tmp
\
&&
git clone https://eicweb.phy.anl.gov/EIC/juggler.git
\
&&
mkdir
-p
juggler/build
&&
cd
juggler/build
\
&&
cmake ../.
-DCMAKE_CXX_STANDARD
=
17
-DCMAKE_INSTALL_PREFIX
=
/usr/local
\
&&
cmake ../.
-DCMAKE_CXX_STANDARD
=
20
-DCMAKE_INSTALL_PREFIX
=
/usr/local
\
&&
make
-j30
&&
make
-j4
install
\
&&
cd
/tmp
&&
rm
-rf
/tmp/juggler
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment