Skip to content

Commit 20bf9d4

Browse files
committed
test: disable rollover correction
1 parent 718b719 commit 20bf9d4

1 file changed

Lines changed: 0 additions & 19 deletions

File tree

common-tools/clas-detector/src/main/java/org/jlab/detector/scalers/DaqScalersSequence.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -361,25 +361,6 @@ public boolean validateOrdering() {
361361
* 2. Assume any subsequent clock decrease is a rollover.
362362
*/
363363
public void fixClockRollover() {
364-
boolean modified = true;
365-
while (modified) {
366-
modified = false;
367-
for (int i=this.scalers.size()-1; i>0; --i) {
368-
Dsc2Scaler previous = this.scalers.get(i-1).dsc2;
369-
Dsc2Scaler next = this.scalers.get(i).dsc2;
370-
if (previous.clock > next.clock) {
371-
for (int j=i; j<this.scalers.size(); ++j) {
372-
if (j==i) System.out.print( String.format("FIXING CLOCK ROLLOVER: %d %d -> ",this.scalers.get(j).dsc2.clock,this.scalers.get(j).dsc2.gatedClock));
373-
this.scalers.get(j).dsc2.clock += 2*(long)Integer.MAX_VALUE;
374-
// The gated clock also rolls over (but it's triggered by the ungated clock, not itself!?):
375-
this.scalers.get(j).dsc2.gatedClock += 2*(long)Integer.MAX_VALUE;
376-
if (j==i) System.out.println(String.format("%d %d",this.scalers.get(j).dsc2.clock,this.scalers.get(j).dsc2.gatedClock));
377-
}
378-
modified = true;
379-
break;
380-
}
381-
}
382-
}
383364
}
384365

385366
public static void main(String[] args) {

0 commit comments

Comments
 (0)