lcsim/src/org/lcsim/recon/muon
diff -u -r1.13 -r1.14
--- MuonCalSegmentFinder.java 13 Sep 2006 21:47:12 -0000 1.13
+++ MuonCalSegmentFinder.java 3 Oct 2006 05:26:39 -0000 1.14
@@ -176,14 +176,22 @@
long virtualID = segm.findCellContainingXYZ( rpVect );
cellList.add(virtualID);
if(stpr.getStopTkELow())break; // C.M.
- // Go on to the next layer
- if(nr!=(nLayers-1)) r = r + dr;
- else { r = rmin + nLayers*dr; }
- dist=(nr!=(nLayers-1))?dr:(dr+dr-(rLayer0Mid-rmin));
-
+
+ if(stpr.getCurlBack())
+ {
+ if(debug &&(stpr.partR(rpVect)-dr)<(r-dr) )
+ System.out.println("!!!BCF:CURLINGBACK old r="+r+" New r="+(r-dr));
+ if(stpr.partR(rpVect)<r) r=r-dr ;
+ } // Go on to the next layer
+ else if(nr!=(nLayers-1)) r = r + dr;
+ else
+ {
+ r = rmin + nLayers * dr;
+ if(debug)System.out.println("BCF: AT Exit of "+subdetName+", r="+r);
+ }
stpr.tkSteps(r, zmax,det, subdetName, nr);
rpVect = stpr.getNewRp();
- nr++;
+ if(!stpr.getCurlBack())nr++;
}
// Save number of layers track passed through