Print

Print


Commit in lcsim/src/org/lcsim/recon/cluster/density on MAIN
MCUtil.java+2-11.1 -> 1.2
MyTools.java+3-31.1 -> 1.2
+5-4
2 modified files
GL: Geometry adjustments (still hardwired for now)

lcsim/src/org/lcsim/recon/cluster/density
MCUtil.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MCUtil.java	12 Aug 2005 19:59:49 -0000	1.1
+++ MCUtil.java	27 Sep 2005 20:46:25 -0000	1.2
@@ -17,7 +17,8 @@
 //         }
         double rad = vert[0]*vert[0]+vert[1]*vert[1];
         if(rad>0.) rad = Math.sqrt(rad);
-        if(rad<125. && Math.abs(vert[2])<185.){
+//	if(rad<125. && Math.abs(vert[2])<185.){
+         if(rad<127. && Math.abs(vert[2])<168.){
             beforeCalorimeter = true;
         }
         return beforeCalorimeter;

lcsim/src/org/lcsim/recon/cluster/density
MyTools.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MyTools.java	12 Aug 2005 19:59:49 -0000	1.1
+++ MyTools.java	27 Sep 2005 20:46:25 -0000	1.2
@@ -36,16 +36,16 @@
 //     }
 
     public static int getSysno( long cellid ) {
-      int sysno = (int)(cellid>>16)&0x7;
+      int sysno = (int)(cellid>>7)&0x7;
       return sysno;
     }
 
     public static int getSysBE( long cellid ) {
-	return (int)((cellid>>16) & 0x3f);
+	return (int)((cellid>>7) & 0x3f);
     }
 
     public static int getLayer( long cellid ) {
-	int layer = (int)((cellid>>0) & 0xffff);
+	int layer = (int)((cellid>>0) & 0x7f);
 	return layer;
     }
 
CVSspam 0.2.8