Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ reconstruction/swaps/ @baltzell @raffaelladevita
reconstruction/tof/ @zieglerv @raffaelladevita
reconstruction/urwell/ @raffaelladevita @tongtongcao
reconstruction/vtx/ @zieglerv
reconstruction/calib/ @raffaelladevita

# etc
etc/bankdefs/ @baltzell @raffaelladevita @c-dilks
Expand Down
37 changes: 37 additions & 0 deletions etc/bankdefs/hipo4/dc.json
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,43 @@
{"name":"dx", "type":"F", "info":"pathlength of the track through the detector element (cm)"},
{"name":"edge", "type":"F", "info":"distance to the closest detector edge (cm), -1 if edge is not defined, 0 if outside, >0 if inside"}
]
},
{
"name": "DC::calib",
"group": 20600,
"item" : 55,
"info": "reconstructed hits using DC timing information",
"entries": [
{"name":"id", "type":"S", "info":"id of the hit"},
{"name":"status", "type":"S", "info":"id of the hit"},
{"name":"sector", "type":"B", "info":"DC sector"},
{"name":"superlayer", "type":"B", "info":"DC superlayer (1...6)"},
{"name":"layer", "type":"B", "info":"DC layer in superlayer (1...6)"},
{"name":"wire", "type":"S", "info":"wire id of DC"},
{"name":"TDC", "type":"I", "info":"raw time of the hit"},
{"name":"jitter", "type":"B", "info":"time jitter (ns)"},
{"name":"doca", "type":"F", "info":"doca of the hit calculated from TDC (in cm)"},
{"name":"docaError", "type":"F", "info":"uncertainty on doca of the hit calculated from TDC (in cm)"},
{"name":"trkDoca", "type":"F", "info":"track doca of the hit (in cm)"},
{"name":"timeResidual", "type":"F", "info":"time residual of the hit (in cm)"},
{"name":"fitResidual", "type":"F", "info":"fit residual of the hit (in cm, from KF)"},
{"name":"DAFWeight", "type":"F", "info":"Weight by DAF; the 1st bit of status indicates that a hit is belong to single or double"},
{"name":"LR", "type":"B", "info":"Left/Right ambiguity of the hit"},
{"name":"X", "type":"F", "info":"wire x-coordinate in tilted-sector"},
{"name":"Z", "type":"F", "info":"wire z-coordinate in tilted-sector"},
{"name":"B", "type":"F", "info":"B-field intensity at hit position in tilted-sector system"},
{"name":"Alpha", "type":"F", "info":"local angle (degr.) in tilted-sector system"},
{"name":"TProp", "type":"F", "info":"t propagation along the wire (ns)"},
{"name":"TFlight", "type":"F", "info":"time of flight correction (ns)"},
{"name":"T0", "type":"F", "info":"T0 (ns)"},
{"name":"TStart", "type":"F", "info":"event start time used (ns)"},
{"name":"dDoca", "type":"F", "info":"delta Doca correction (cm)"},
{"name":"clusterID", "type":"S", "info":"ID of associated cluster"},
{"name":"trkID", "type":"B", "info":"ID of associated track"},
{"name":"time", "type":"F", "info":"time used in tracking (ns)"},
{"name":"beta", "type":"F", "info":"beta used in tracking"},
{"name":"tBeta", "type":"F", "info":"beta-dependent time correction used in tracking"}
]
}

]
42 changes: 42 additions & 0 deletions etc/bankdefs/hipo4/rich.json
Original file line number Diff line number Diff line change
Expand Up @@ -220,5 +220,47 @@
{"name":"best_ntot", "type":"F", "info":"Number of photon used for likelihood"},
{"name":"best_mass", "type":"F", "info":"Reconstructed mass for best hypothesis"}
]
},
{
"name": "RICH::calib",
"group": 21800,
"item" : 51,
"info": "Reconstructed Photons in RICH selected for detector calibration",
"entries": [
{"name":"hindex", "type":"S", "info":"related row in the RICH::hits bank"},
{"name":"pindex", "type":"B", "info":"related row in the REC::Particle bank"},
{"name":"sector", "type":"B", "info":"Hit sector"},
{"name":"pmt", "type":"S", "info":"Hit pmt" },
{"name":"anode", "type":"S", "info":"Hit anode" },
{"name":"x", "type":"F", "info":"Hit x" },
{"name":"y", "type":"F", "info":"Hit y" },
{"name":"z", "type":"F", "info":"Hit z" },
{"name":"time", "type":"F", "info":"Hit time" },
{"name":"rawtime", "type":"F", "info":"Hit rawtime" },
{"name":"duration", "type":"S", "info":"Hit duration" },
{"name":"status", "type":"S", "info":"Hit status" },
{"name":"used", "type":"B", "info":"eligible for PID in time (1=yes, 0=no) angle (10=yes, 0=no) hypo (100=by other) or cluster (2)"},
{"name":"emilay", "type":"B", "info":"aerogel layer of photon emission"},
{"name":"emico", "type":"B", "info":"aerogel component of photon emission"},
{"name":"enico", "type":"B", "info":"aerogel component of photon entrance point"},
{"name":"emqua", "type":"S", "info":"aerogel quadrant of photon emission"},
{"name":"start_time", "type":"F", "info":"time at photon emission point"},
{"name":"traced_the", "type":"F", "info":"Lab theta angle for traced solution"},
{"name":"traced_phi", "type":"F", "info":"Lab phi angle for traced solution"},
{"name":"traced_hitx", "type":"F", "info":"Lab hitx angle for traced solution"},
{"name":"traced_hity", "type":"F", "info":"Lab hity angle for traced solution"},
{"name":"traced_hitz", "type":"F", "info":"Lab hitz angle for traced solution"},
{"name":"traced_path", "type":"F", "info":"path for traced solution"},
{"name":"traced_time", "type":"F", "info":"time for traced solution"},
{"name":"traced_nrfl", "type":"S", "info":"n reflections for traced solution"},
{"name":"traced_nrfr", "type":"S", "info":"n refractions for traced solution"},
{"name":"traced_1rfl", "type":"S", "info":"first reflection type for traced solution"},
{"name":"traced_layers", "type":"I", "info":"sequence of hit layers (reflections)"},
{"name":"traced_compos", "type":"I", "info":"sequence of hit components (reflections)"},
{"name":"traced_etaC", "type":"F", "info":"etaC angle for traced solution" },
{"name":"etac_ref", "type":"F", "info":"Cherenkov angle expected value"},
{"name":"etac_rms", "type":"F", "info":"Cherenkov angle expected resolution"},
{"name":"prob", "type":"F", "info":"probability for traced solution with given hypo"}
]
}
]
81 changes: 78 additions & 3 deletions etc/bankdefs/hipo4/tof.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,45 @@
{"name":"midbarAlgo_1B_tCorr", "type":"F", "info":"corrected hit time using middle of bar algorithm to compute the path length between 1A and 1B"},
{"name":"EmaxAlgo_1B_tCorr", "type":"F", "info":"corrected hit time using Emax algorithm to compute the path length between 1A and 1B"} ]
},

{
"name": "FTOF::calib",
"group": 21200,
"item" : 35,
"info": "reconstructed hit info from FTOF calibration",
"entries": [
{"name":"id", "type":"S", "info":"id of the hit"},
{"name":"status", "type":"S", "info":"hit status defined based on presence (0) or absence (1) of TDCR-TDCL-ADCR-ADCL"},
{"name":"trackid", "type":"S", "info":"matched DC track id"},
{"name":"sector", "type":"B", "info":"sector of FTOF"},
{"name":"layer", "type":"B", "info":"panel id of FTOF (1-1A, 2-1B, 3-2"},
{"name":"component", "type":"S", "info":"paddle id of FTOF"},
{"name":"energy", "type":"F", "info":"E dep (MeV) of hit"},
{"name":"time", "type":"F", "info":"Hit time (ns)"},
{"name":"x", "type":"F", "info":"Global X coor (cm) of hit"},
{"name":"y", "type":"F", "info":"Global Y coor (cm) of hit"},
{"name":"z", "type":"F", "info":"Global Z coor (cm) of hit"},
{"name":"tx", "type":"F", "info":"Global X coor (cm) of hit from DC info - trackid index"},
{"name":"ty", "type":"F", "info":"Global Y coor (cm) of hit from DC info - trackid index"},
{"name":"tz", "type":"F", "info":"Global Z coor (cm) of hit from DC info - trackid index"},
{"name":"adc1", "type":"I", "info":"ADCL"},
{"name":"adc2", "type":"I", "info":"ADCR"},
{"name":"tdc1", "type":"I", "info":"TDCL"},
{"name":"tdc2", "type":"I", "info":"TDCR"},
{"name":"pindex", "type":"S", "info":"particle positionin REC::Particle"},
{"name":"pid", "type":"I", "info":"particle id"},
{"name":"charge", "type":"B", "info":"particle charge"},
{"name":"px", "type":"F", "info":"particle momentum x component"},
{"name":"py", "type":"F", "info":"particle momentum y component"},
{"name":"pz", "type":"F", "info":"particle momentum z component"},
{"name":"vx", "type":"F", "info":"particle vertex x coordinate"},
{"name":"vy", "type":"F", "info":"particle vertex y coordinate"},
{"name":"vz", "type":"F", "info":"particle vertex z coordinate"},
{"name":"chi2", "type":"F", "info":"track chi2"},
{"name":"NDF", "type":"S", "info":"NDF"},
{"name":"pathLength", "type":"F", "info":"pathlength of the track from the vertex (doca point to the beamline to the midpoint between the entrance and exit of the hit bar"},
{"name":"pathLengthThruBar", "type":"F", "info":"pathlength of the track from the entrance point to the exit point through the hit bar "}
]
},
{
"name": "CTOF::rawhits",
"group": 20400,
Expand Down Expand Up @@ -228,6 +266,43 @@
{"name":"z", "type":"F", "info":"Global Z coor (cm) of cluster seed"},
{"name":"pathLengthThruBar", "type":"F", "info":"pathlength of the track from the entrance point to the exit point through the cluster bars "}
]
}

},
{
"name": "CTOF::calib",
"group": 20400,
"item" : 25,
"info": "reconstructed hit info from CTOF calibration",
"entries": [
{"name":"id", "type":"S", "info":"id of the hit"},
{"name":"status", "type":"S", "info":"hit status defined based on presence (0) or absence (1) of TDCR-TDCL-ADCR-ADCL"},
{"name":"trackid", "type":"S", "info":"matched DC track id"},
{"name":"component", "type":"S", "info":"paddle id of CTOF"},
{"name":"energy", "type":"F", "info":"E dep (MeV) of hit"},
{"name":"time", "type":"F", "info":"Hit time (ns)"},
{"name":"x", "type":"F", "info":"Global X coor (cm) of hit"},
{"name":"y", "type":"F", "info":"Global Y coor (cm) of hit"},
{"name":"z", "type":"F", "info":"Global Z coor (cm) of hit"},
{"name":"tx", "type":"F", "info":"Global X coor (cm) of hit from DC info - trackid index"},
{"name":"ty", "type":"F", "info":"Global Y coor (cm) of hit from DC info - trackid index"},
{"name":"tz", "type":"F", "info":"Global Z coor (cm) of hit from DC info - trackid index"},
{"name":"adc1", "type":"I", "info":"ADCL"},
{"name":"adc2", "type":"I", "info":"ADCR"},
{"name":"tdc1", "type":"I", "info":"TDCL"},
{"name":"tdc2", "type":"I", "info":"TDCR"},
{"name":"pindex", "type":"S", "info":"particle positionin REC::Particle"},
{"name":"pid", "type":"I", "info":"particle id"},
{"name":"charge", "type":"B", "info":"particle charge"},
{"name":"px", "type":"F", "info":"particle momentum x component"},
{"name":"py", "type":"F", "info":"particle momentum y component"},
{"name":"pz", "type":"F", "info":"particle momentum z component"},
{"name":"vx", "type":"F", "info":"particle vertex x coordinate"},
{"name":"vy", "type":"F", "info":"particle vertex y coordinate"},
{"name":"vz", "type":"F", "info":"particle vertex z coordinate"},
{"name":"vt", "type":"F", "info":"vertex-corrected event start time" },
{"name":"chi2", "type":"F", "info":"track chi2"},
{"name":"NDF", "type":"S", "info":"NDF"},
{"name":"pathLength", "type":"F", "info":"pathlength of the track from the vertex (doca point to the beamline to the midpoint between the entrance and exit of the hit bar"},
{"name":"pathLengthThruBar", "type":"F", "info":"pathlength of the track from the entrance point to the exit point through the hit bar "}
]
}
]
4 changes: 2 additions & 2 deletions etc/bankdefs/util/bankSplit.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ def create(dirname, banklist):
dets = band + raster + rich + rtpc + alert

# additions for the calibration schema:
calib = ["BAND::adc","BAND::laser","BAND::tdc","BAND::hits","BAND::rawhits","CND::adc","CND::hits","CND::tdc","CTOF::adc","CTOF::hits","CTOF::tdc","CVTRec::Tracks","CVTRec::UTracks","ECAL::adc","ECAL::calib","ECAL::clusters","ECAL::peaks","ECAL::tdc","FMT::Hits","FMT::Clusters","FMT::Tracks","FMT::Trajectory","FT::particles","FTCAL::adc","FTCAL::clusters","FTCAL::hits","FTHODO::adc","FTHODO::clusters","FTHODO::hits","FTTRK::clusters","FTTRK::hits","FTTRK::crosses","FTOF::adc","FTOF::hits","FTOF::tdc","HTCC::adc","HTCC::rec","LTCC::adc","LTCC::clusters","RASTER::adc","RF::adc","RF::tdc","RICH::tdc","RICH::Hit","RICH::Particle","RICH::Hadron","RICH::Photon","RICH::Ring","RTPC::adc","RTPC::hits","RTPC::tracks","RUN::rf","RUN::trigger","TimeBasedTrkg::TBHits","TimeBasedTrkg::TBTracks"]
calib = ["BAND::adc","BAND::laser","BAND::tdc","BAND::hits","BAND::rawhits","CND::adc","CND::hits","CND::tdc","CTOF::calib","CVTRec::Tracks","CVTRec::UTracks","DC::calib","ECAL::adc","ECAL::calib","ECAL::clusters","ECAL::peaks","ECAL::tdc","FMT::Hits","FMT::Clusters","FMT::Tracks","FMT::Trajectory","FT::particles","FTCAL::adc","FTCAL::clusters","FTCAL::hits","FTHODO::adc","FTHODO::clusters","FTHODO::hits","FTTRK::clusters","FTTRK::hits","FTTRK::crosses","FTOF::adc","FTOF::calib","HTCC::adc","HTCC::rec","LTCC::adc","LTCC::clusters","RASTER::adc","RF::adc","RF::tdc","RICH::calib","RTPC::adc","RTPC::hits","RTPC::tracks","RUN::rf","RUN::trigger","TimeBasedTrkg::TBTracks"]

# additions for the monitoring schema:
mon = ["BMT::adc","BMTRec::Clusters","BMTRec::Crosses","BMTRec::Hits","BMTRec::LayerEffs","BST::adc","BSTRec::Clusters","BSTRec::Crosses","BSTRec::Hits","BSTRec::LayerEffs","CND::clusters","CVTRec::Trajectory","ECAL::hits","FMT::adc","FTTRK::adc","HEL::adc","HitBasedTrkg::HBTracks","RAW::vtp","TimeBasedTrkg::TBCrosses","TimeBasedTrkg::TBSegments","TimeBasedTrkg::TBSegmentTrajectory","TimeBasedTrkg::Trajectory"]
mon = ["BMT::adc","BMTRec::Clusters","BMTRec::Crosses","BMTRec::Hits","BMTRec::LayerEffs","BST::adc","BSTRec::Clusters","BSTRec::Crosses","BSTRec::Hits","BSTRec::LayerEffs","CND::clusters","CTOF::adc","CTOF::hits","CTOF::tdc","CVTRec::Trajectory","ECAL::hits","FMT::adc","FTTRK::adc","FTOF::adc","FTOF::hits","FTOF::tdc","HEL::adc","HitBasedTrkg::HBTracks","RAW::vtp","RICH::Particle","RICH::Ring","TimeBasedTrkg::TBCrosses","TimeBasedTrkg::TBHits","TimeBasedTrkg::TBSegments","TimeBasedTrkg::TBSegmentTrajectory","TimeBasedTrkg::Trajectory"]

# trigger validation needs these:
trig = ["RAW::vtp","HTCC::rec","ECAL::adc","ECAL::calib","ECAL::clusters","ECAL::hits","ECAL::moments","ECAL::peaks","ECAL::tdc","ECAL::trigger"]
Expand Down
2 changes: 2 additions & 0 deletions etc/services/data-ai.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ services:
name: RTPC
- class: org.jlab.rec.service.vtx.VTXEngine
name: VTX
- class: org.jlab.calibration.service.CalibBanksEngine
name: CALIB
configuration:
global:
variation: rgb_spring2019
Expand Down
2 changes: 2 additions & 0 deletions etc/services/data-aicv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ services:
name: RTPC
- class: org.jlab.rec.service.vtx.VTXEngine
name: VTX
- class: org.jlab.calibration.service.CalibBanksEngine
name: CALIB
configuration:
global:
variation: rgb_spring2019
Expand Down
2 changes: 2 additions & 0 deletions etc/services/data-cv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ services:
name: RTPC
- class: org.jlab.rec.service.vtx.VTXEngine
name: VTX
- class: org.jlab.calibration.service.CalibBanksEngine
name: CALIB
configuration:
global:
variation: rgb_spring2019
Expand Down
2 changes: 2 additions & 0 deletions etc/services/dcalign.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ services:
name: RICH
- class: org.jlab.service.rtpc.RTPCEngine
name: RTPC
- class: org.jlab.calibration.service.CalibBanksEngine
name: CALIB
configuration:
global:
variation: rgb_spring2019
Expand Down
2 changes: 2 additions & 0 deletions etc/services/denoise.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ services:
name: RICH
- class: org.jlab.service.rtpc.RTPCEngine
name: RTPC
- class: org.jlab.calibration.service.CalibBanksEngine
name: CALIB
configuration:
global:
variation: rgb_spring2019
Expand Down
2 changes: 2 additions & 0 deletions etc/services/kpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ services:
name: RICH
- class: org.jlab.service.rtpc.RTPCEngine
name: RTPC
- class: org.jlab.calibration.service.CalibBanksEngine
name: CALIB
configuration:
services:
MAGFIELDS:
Expand Down
2 changes: 2 additions & 0 deletions etc/services/mc-ai.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ services:
name: RTPC
- class: org.jlab.rec.service.vtx.VTXEngine
name: VTX
- class: org.jlab.calibration.service.CalibBanksEngine
name: CALIB
configuration:
# global:
# variation: rga_fall2018_mc
Expand Down
2 changes: 2 additions & 0 deletions etc/services/mc-aicv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ services:
name: RTPC
- class: org.jlab.rec.service.vtx.VTXEngine
name: VTX
- class: org.jlab.calibration.service.CalibBanksEngine
name: CALIB
configuration:
# global:
# variation: rga_fall2018_mc
Expand Down
2 changes: 2 additions & 0 deletions etc/services/mc-cv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ services:
name: RTPC
- class: org.jlab.rec.service.vtx.VTXEngine
name: VTX
- class: org.jlab.calibration.service.CalibBanksEngine
name: CALIB
configuration:
# global:
# variation: rga_fall2018_mc
Expand Down
39 changes: 39 additions & 0 deletions reconstruction/calib/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.jlab.clas12.detector</groupId>
<artifactId>clas12detector-calib</artifactId>
<version>13.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.jlab.clas12</groupId>
<artifactId>reconstruction</artifactId>
<version>13.1.0-SNAPSHOT</version>
</parent>

<dependencies>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-io</artifactId>
<version>13.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-detector</artifactId>
<version>13.1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.jlab.clas</groupId>
<artifactId>clas-reco</artifactId>
<version>13.1.0-SNAPSHOT</version>
</dependency>

</dependencies>
</project>
Loading
Loading