Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -345,10 +345,12 @@ public static List<ECStrip> readStripsHipo(DataEvent event, int run, ConstantsM
int ip = bank.getShort("component",i);
int tdc = bank.getInt("TDC",i);

if(status.getIntValue("status",is,il,ip)==2) continue; //for MC use only
int istatus = status.getIntValue("status",is,il,ip);

if(istatus==2 || istatus==3) continue;

if(tdc>0) {
if(!tdcs.hasItem(is,il,ip)) tdcs.add(new ArrayList<Integer>(),is,il,ip);
if(!tdcs.hasItem(is,il,ip)) tdcs.add(new ArrayList<>(),is,il,ip);
tdcs.getItem(is,il,ip).add(tdc);
}
}
Expand All @@ -366,11 +368,13 @@ public static List<ECStrip> readStripsHipo(DataEvent event, int run, ConstantsM
float t = bank.getFloat("time", i) + (float) tmf.getDoubleValue("offset",is,il,ip) // TDC-FADC offset (sector, layer, PMT)
+ (float) fo.getDoubleValue("offset",is,il,0); // TDC-FADC offset (sector, layer)

if (status.getIntValue("status",is,il,ip)==3) continue; //for MC use only
int istatus = status.getIntValue("status",is,il,ip);

if(istatus==1 || istatus==3) continue;

ECStrip strip = new ECStrip(is, il, ip);

strip.setStatus(status.getIntValue("status",is,il,ip));
strip.setStatus(istatus);
strip.setADC(adc);
strip.setTriggerPhase(triggerPhase);
strip.setID(bank.trueIndex(i)+1);
Expand Down