Skip to content

Commit ffcf6f7

Browse files
rafoparfbossuraffaelladevita
authored
Truth Matching (JeffersonLab#649)
* truth matching. first commit * fix acceptance cuts * switch level for debug printouts * Merged with the development * Added a note reminding that Truth matching engine should be added * The MC Truth Matching engine is added in the EngineProcessor.java * The EngineProcessor.java is updated to process Truth matching * All stylish modifications. Just need to switchth beanch, that is way commiting * some imports are not used, so they are commented * Printout changes only * Temporarily changing the maximum Evio even size from 500kb to 2500Kb, to perform reconstruction for Truth Matching at JLab. So I need to push to git * evio2hipo: patch to get corrected pointers from MC::true to ECAL ADC/TDC banks * In the ECAL::hits bank now it fills the variale id, which points to the row number of the corresponding hit in the ADC bank * Added the variable clusterId in the ECAL::hits bank * Just small change in the info field of the clusterId * this.peakStrips exists, but there is not getter method. Adding a getter method for it * added the clusterId, and getter and setter methods for it intto the ECStrip class * When cluster gets defined. we fill cluster Ids for strips that the given cluster belongs to * Added to filling the bank ECAL::hits with the variable clusterId * Looping over clusters and then filling clusterid for it * Formating changes were undone in ECEngine.java, and necesarry additions were added. This way it should be easier to compare in pull request * Travis build failed, Rafaella suggested to add this lines in the mc/pom that could fix it * Following lines are added to make the Travis build to not fail * In EngineProcessor commenting the Original TruthMarching Engine, and addinf the new 'TruthMatch' for tests * Still incmplete version, but Need to commit it before I can sync my version with the development version * a comma was missing in a previous commiit in the EngineProcessor.java file * Not a final working version yet, but before concluding the work for today, committing all changes * The p-index variable is added in the MC::IsParticleMatched bank, which points to the p-index of the recon particle * TruthMatch.java has the initial version of Matching for photons in PCal/ECal. Note at this moment there is still an issue with some events, when we find a cluster which is not assiciated to any Rec Hit in the PCal/ECal * reconstruction/mc/pom.xml version is updated to be the same as the one in the development * version change in the reconstruction/mc/pom.xml to be the same as in the development branch * Some printout are cleaned, and in the map matched_PCalcounts.get(match.pindex), before accessing an entry with a given key, we checked whether they key exist. Without it it was causing Null ptr exception * TruthMatch.java: in the getECalHits, one more argument is added, which is Map of MC hits for ECal detector. and before adding the RecHit to the return list, it checks if the hit is associated to any MC::Hit, if not then the hit is not added. The reason is that this hit will not be processed later. So removing them * The Matching of neutrals in FTCal is added. Not tested yet. Next steps are tests * Added a condition, to check if the FTCal cluster is associated to any recon particle, to prevent exceptions, as in FTCal any single hit is a cluster, but not necesairly a recon particle. Also some printouts re commented * The CND part of TruthMatch is added. Not tested yet, next step is testing * In the if statement for matching of neutrals it is also added an additionanal *or* to check if the mcp is neutron. * CTOF matching is added * CND and CTOF cluster banke names were missspelled. This commit is a fix of those. * intermediat printouts. Need to change the branch, thus committing * Some fiagnostic printouts are cleaned * In the reconstruction/mc/pom.xml, 6.5.9-SNAPSHOT changed to 6.5.11-SNAPSHOT, Not sure why it was not committed before * Some printout were commented, which were there for diagnostic purposes * the link between the CND(CTOF)::hits hits, and the MC::True hit is fixed, i.e. id is replaced by indexLtdc/2 for CND, and tdc_idx1/2 * The pom for MC is updated * An additional getMCHits, and additional check is added to make sure the map has the given key * CTOF hitID was wrong, unlike to CND, we should not have devided it by 2 * Work in progress, just need to change branch * In the pom the version is updated * Work in progress, just need to change the branch * Just some comments are modified/added, Work in progress * Cleaned up the TruthMatching bank, and also added a *LayersTrkMC* variable which encodes which layer of the detector the given MCParticle hit * Work in progress, just need to push into github * The variable name *LayersTrkMC* is changed to *MCLayersTrk* * BST MC hits are added into MCLayersTrk * RecLayersTrk variable is added in the IsParticleMatched bank * Now matching is reading the REC::Particle bank, and also for each MCPartilce it fills the variable RecLayersTrk, representing which layers contributed to the given RecParticle * Cosmetic change * the MC pom file is changed to reflect new changes * WIP need to change the branch * the trkID interpretation was wrong. It was fixed, now going from the RecHit to p-index is correct for BST and BMT * In the MCRecMatch RecLayersTrk is now note solely depends o the RecPartilce, but instead on the combination of MC::Particle and Rec::Particle, i.e. it represents hit layers of MC::Particle that are matched only to the corresponding Rec Particle. Before in cases, when more than one MC particle is matched to the given Rec::particle, then that potentially would represent hits from all MC::particles * MCLayersNeut and RecLayersNeut are added, though * Some printouts which were useed for debugging were commented * Two methods are added CountNSetBits and CheckDCAcceptance, to count set bits in a certain range and also to check whether the track is in DC acceptance * The file has not beed saved in the previous commit, so saved again * This file was the one developed by Franchesco, so in otder to avoid accidental use of it, it will be removed in this branch, and hence will not go into the development branch * A commented line was removed, for the code to look more clean * jsut a space is added * Two lines are commented, that will not print WARNING message for every event, which doesn't have MC::Trur or MC::Particle bank * In bin/hipo-utils it was /bin/bash instead of /bin/sh. Don't exactly remember why. It is changed bac to sh. Thanks to Nathan for noticing * The hipo3 json file was changed, i.e. truth matching bank to be same variables as the hipo4 bank * MC::MatchedClusters was a bank whcih was used in the initial version of the Truth Matching to be used for debugging ( I think), and was introduced by Francesco, however we are not filling this bank anymore, so we just drop it * During the SWO meeting it was decided to change Event size requiremet from 2500kB to 500kB as soon we expect gemc will output into hipo. Then someone who wants to use it, can manualy change to 2500 kB as a temporary solution Co-authored-by: fbossu <[email protected]> Co-authored-by: Raffaella De Vita <[email protected]>
1 parent d8d906e commit ffcf6f7

File tree

13 files changed

+1902
-12
lines changed

13 files changed

+1902
-12
lines changed

‎build-coatjava.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,5 @@ cd -
100100
cp common-tools/coat-lib/target/coat-libs-*-SNAPSHOT.jar coatjava/lib/clas/
101101
cp reconstruction/*/target/clas12detector-*-SNAPSHOT.jar coatjava/lib/services/
102102

103+
103104
echo "COATJAVA SUCCESSFULLY BUILT !"

‎common-tools/clas-reco/src/main/java/org/jlab/clas/reco/EngineProcessor.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void initAll(){
7777
"DCHB","FTOFHB","EC",
7878
"CVT","CTOF","CND","BAND",
7979
"HTCC","LTCC","EBHB",
80-
"DCTB","FTOFTB","EBTB","RICHEB","RTPC"
80+
"DCTB","FTOFTB","EBTB","RICHEB","RTPC", "MC"
8181
};
8282

8383
String[] services = new String[]{
@@ -100,7 +100,8 @@ public void initAll(){
100100
"org.jlab.service.ftof.FTOFTBEngine",
101101
"org.jlab.service.eb.EBTBEngine",
102102
"org.jlab.rec.rich.RICHEBEngine",
103-
"org.jlab.service.rtpc.RTPCEngine"
103+
"org.jlab.service.rtpc.RTPCEngine",
104+
"org.jlab.service.mc.TruthMatch"
104105
};
105106

106107
for(int i = 0; i < names.length; i++){

‎common-tools/clas-reco/src/main/java/org/jlab/clas/reco/io/EvioHipoEvent4.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,8 @@ public void fillHipoEventTrueInfo(Event hipoEvent, EvioDataEvent evioEvent){
573573
int irow=0;
574574
for(int k = 0; k < bankNames.length; k++){
575575
if(evioEvent.hasBank(bankNames[k]+"::true")==true){
576+
int offset = 0;
577+
if(bankNames[k].equals("EC") && evioEvent.hasBank("PCAL::dgtz")) offset = evioEvent.getBank("PCAL::dgtz").rows();
576578
EvioDataBank evioBank = (EvioDataBank) evioEvent.getBank(bankNames[k]+"::true");
577579
for(int i = 0; i < evioBank.rows(); i++){
578580
hipoBank.putByte("detector", irow, (byte) bankTypes[k].getDetectorId());
@@ -601,7 +603,7 @@ public void fillHipoEventTrueInfo(Event hipoEvent, EvioDataEvent evioEvent){
601603
hipoBank.putFloat("avgT", irow, (float) evioBank.getDouble("avgT",i));
602604
hipoBank.putInt("nsteps", irow, evioBank.getInt("nsteps",i));
603605
hipoBank.putInt("procID", irow, evioBank.getInt("procID",i));
604-
hipoBank.putInt("hitn", irow, evioBank.getInt("hitn",i));
606+
hipoBank.putInt("hitn", irow, evioBank.getInt("hitn",i)+offset);
605607
irow++;
606608
}
607609
}

‎etc/bankdefs/hipo/MC.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,19 @@
9595
{"name":"procID", "id":26, "type":"int32", "info":"Process that created the FP. see gemc.jlab.org"},
9696
{"name":"hitn", "id":27, "type":"int32", "info":"Hit number"}
9797
]
98+
},
99+
{
100+
"name": "MC::IsParticleMatched",
101+
"group": 45,
102+
"info": "MC Particle - Rec Track matching.",
103+
"items": [
104+
{"name":"mcTindex", "type":"S", "info":"MC Particle index, as in tid"},
105+
{"name":"pindex", "type":"S", "info":"REC particle index"},
106+
{"name":"MCLayersTrk", "type":"L", "info":"layers of tracker (mostly) detectors that a given MCParticle hit. Each layer corresponds to a specific bit in this variable"},
107+
{"name":"MCLayersNeut", "type":"L", "info":"layers of detectors (non tracker) that a givem MCParticle hit. Each layer corresponds to a specific bit in this variable"},
108+
{"name":"RecLayersTrk", "type":"L", "info":"layers of tracker detectors (mostly) that, the matched RecParticle picked hits from"},
109+
{"name":"RecLayersNeut", "type":"L", "info":"layers of detectors (mostly) that, the matched RecParticle picked hits from"}
110+
]
98111
}
112+
99113
]

‎etc/bankdefs/hipo4/ecal.json‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
"item" : 21,
66
"info": "ECAL hits",
77
"entries": [
8-
{"name":"id", "type":"S", "info":"id of the hit"},
9-
{"name":"status", "type":"S", "info":"status of the hit"},
10-
{"name":"sector", "type":"B", "info":"sector of ECAL"},
11-
{"name":"layer", "type":"B", "info":"Layer of ECAL (1-3:PCAL, 4-6:ECIN, 7-9:ECOUT"},
12-
{"name":"strip", "type":"B", "info":"Strip number"},
13-
{"name":"peakid", "type":"B", "info":"Peak id"},
14-
{"name":"energy", "type":"F", "info":"Energy of the hit"},
15-
{"name":"time", "type":"F", "info":"Time of the hit"}
8+
{"name":"id", "type":"S", "info":"id of the hit"},
9+
{"name":"clusterId", "type":"S", "info":"id of the cluster the hit belongs to"},
10+
{"name":"status", "type":"S", "info":"status of the hit"},
11+
{"name":"sector", "type":"B", "info":"sector of ECAL"},
12+
{"name":"layer", "type":"B", "info":"Layer of ECAL (1-3:PCAL, 4-6:ECIN, 7-9:ECOUT"},
13+
{"name":"strip", "type":"B", "info":"Strip number"},
14+
{"name":"peakid", "type":"B", "info":"Peak id"},
15+
{"name":"energy", "type":"F", "info":"Energy of the hit"},
16+
{"name":"time", "type":"F", "info":"Time of the hit"}
1617
]
1718
},
1819
{

‎etc/bankdefs/hipo4/mc.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,20 @@
100100
{"name":"procID", "type":"I", "info":"Process that created the FP. see gemc.jlab.org"},
101101
{"name":"hitn", "type":"I", "info":"Hit number"}
102102
]
103+
},
104+
{
105+
"name": "MC::IsParticleMatched",
106+
"group": 40,
107+
"item" : 5,
108+
"info": "MC Particle - Rec Track matching.",
109+
"entries": [
110+
{"name":"mcTindex", "type":"S", "info":"MC Particle index, as in tid"},
111+
{"name":"pindex", "type":"S", "info":"REC particle index"},
112+
{"name":"MCLayersTrk", "type":"L", "info":"layers of tracker (mostly) detectors that a given MCParticle hit. Each layer corresponds to a specific bit in this variable"},
113+
{"name":"MCLayersNeut", "type":"L", "info":"layers of detectors (non tracker) that a givem MCParticle hit. Each layer corresponds to a specific bit in this variable"},
114+
{"name":"RecLayersTrk", "type":"L", "info":"layers of tracker detectors (mostly) that, the matched RecParticle picked hits from"},
115+
{"name":"RecLayersNeut", "type":"L", "info":"layers of detectors (mostly) that, the matched RecParticle picked hits from"}
116+
]
103117
}
118+
104119
]

‎reconstruction/ec/src/main/java/org/jlab/service/ec/ECCommon.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ public static List<ECStrip> readStripsHipo(DataEvent event, int run, ConstantsM
225225

226226
strip.setADC(adc);
227227
strip.setTriggerPhase(triggerPhase);
228+
strip.setID(i+1);
228229

229230
double sca = (is==5)?AtoE5[ind[il-1]]:AtoE[ind[il-1]];
230231
if (variation=="clas6") sca = 1.0;
@@ -379,7 +380,7 @@ public static List<ECCluster> createClusters(List<ECPeak> peaks, int startLay
379380
clusters.get(i).setEnergy(
380381
clusters.get(i).getEnergy(0) +
381382
clusters.get(i).getEnergy(1) +
382-
clusters.get(i).getEnergy(2));
383+
clusters.get(i).getEnergy(2));
383384
}
384385

385386
return clusters;

‎reconstruction/ec/src/main/java/org/jlab/service/ec/ECEngine.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,23 @@ public boolean processDataEvent(DataEvent de) {
5858

5959
ECCommon.shareClustersEnergy(ecClusters); // Repair 2 clusters which share the same peaks
6060

61+
for (int iCl = 0; iCl < ecClusters.size(); iCl++) {
62+
// As clusters are already defined at this point, we can fill the clusterID of ECStrips belonging to the given cluster
63+
// === U strips ===
64+
for (ECStrip curStrip : ecClusters.get(iCl).getPeak(0).getStrips()) {
65+
curStrip.setClusterId(iCl + 1);
66+
}
67+
// === V strips ===
68+
for (ECStrip curStrip : ecClusters.get(iCl).getPeak(1).getStrips()) {
69+
curStrip.setClusterId(iCl + 1);
70+
}
71+
// === W strips ===
72+
for (ECStrip curStrip : ecClusters.get(iCl).getPeak(2).getStrips()) {
73+
curStrip.setClusterId(iCl + 1);
74+
}
75+
}
76+
77+
6178
if (debug) {
6279
System.out.println(" STRIPS SIZE = " + ecStrips.size());
6380
for(ECStrip strip : ecStrips) System.out.println(strip);
@@ -102,6 +119,8 @@ private void writeHipoBanks(DataEvent de,
102119
bankS.setByte("layer", h, (byte) strips.get(h).getDescriptor().getLayer());
103120
bankS.setByte("strip", h, (byte) strips.get(h).getDescriptor().getComponent());
104121
bankS.setByte("peakid", h, (byte) strips.get(h).getPeakId());
122+
bankS.setShort("id", h, (short) strips.get(h).getID());
123+
bankS.setShort("clusterId", h, (short) strips.get(h).getClusterId());
105124
bankS.setFloat("energy", h, (float) strips.get(h).getEnergy());
106125
bankS.setFloat("time", h, (float) strips.get(h).getTime());
107126
}

‎reconstruction/ec/src/main/java/org/jlab/service/ec/ECPeak.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ public boolean addStrip(ECStrip strip){
102102
return false;
103103
}
104104

105+
public List<ECStrip> getStrips(){
106+
return this.peakStrips;
107+
}
108+
105109
public int getADC(){
106110
int adc = 0;
107111
for(ECStrip s : this.peakStrips){

‎reconstruction/ec/src/main/java/org/jlab/service/ec/ECStrip.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public class ECStrip implements Comparable {
3636
private int triggerPhase = 0;
3737
private double veff = 18.1; // Effective velocity of scintillator light (cm/ns)
3838
private int peakID = -1;
39+
private int id = -1; // ID of the hit. this shows the row number of the corresponding hit in the ADC bank
40+
private int clusterId = -1; // Id (row number) of the cluster that this hit belongs to
3941

4042
private double tdist=0;
4143
private double edist=0;
@@ -167,6 +169,23 @@ public int getPeakId(){
167169
return this.peakID;
168170
}
169171

172+
public void setID(int id){
173+
this.id = id;
174+
}
175+
176+
public int getID(){
177+
return this.id;
178+
}
179+
180+
public void setClusterId(int id){
181+
this.clusterId = id;
182+
}
183+
184+
public int getClusterId(){
185+
return this.clusterId;
186+
}
187+
188+
170189
public void setAttenuation(double a, double b, double c){
171190
this.iAttenLengthA = a;
172191
this.iAttenLengthB = b;

0 commit comments

Comments
 (0)