--- DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2008/03/05 17:00:20 1.34 +++ DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2008/11/20 15:06:26 1.35 @@ -1127,13 +1127,25 @@ resx(ip) = 1000. resy(ip) = resyPAM +cPP --- old --- +c$$$ xm(ip) = -100. +c$$$ ym(ip) = -100. +c$$$ zm(ip) = (zPAM_A+zPAM_B)/2. +c$$$ xm_A(ip) = xPAM_A +c$$$ ym_A(ip) = yPAM_A +c$$$ xm_B(ip) = xPAM_B +c$$$ ym_B(ip) = yPAM_B +cPP --- new --- xm(ip) = -100. ym(ip) = -100. - zm(ip) = (zPAM_A+zPAM_B)/2. + zm(ip) = z_mech_sensor(nplanes-ip+1,il,is)*1000./1.d4 xm_A(ip) = xPAM_A ym_A(ip) = yPAM_A + zm_A(ip) = zPAM_A xm_B(ip) = xPAM_B ym_B(ip) = yPAM_B + zm_B(ip) = zPAM_B +cPP ----------- c zv(ip) = (zPAM_A+zPAM_B)/2. @@ -1158,14 +1170,26 @@ resx(ip) = resxPAM resy(ip) = 1000. +cPP --- old --- +c$$$ xm(ip) = -100. +c$$$ ym(ip) = -100. +c$$$ zm(ip) = (zPAM_A+zPAM_B)/2. +c$$$ xm_A(ip) = xPAM_A +c$$$ ym_A(ip) = yPAM_A +c$$$ xm_B(ip) = xPAM_B +c$$$ ym_B(ip) = yPAM_B +cPP --- new --- xm(ip) = -100. ym(ip) = -100. - zm(ip) = (zPAM_A+zPAM_B)/2. + zm(ip) = z_mech_sensor(nplanes-ip+1,il,is)*1000./1.d4 xm_A(ip) = xPAM_A ym_A(ip) = yPAM_A + zm_A(ip) = zPAM_A xm_B(ip) = xPAM_B ym_B(ip) = yPAM_B - + zm_B(ip) = zPAM_B +cPP ----------- + c zv(ip) = (zPAM_A+zPAM_B)/2. else @@ -3391,9 +3415,13 @@ * ---------------------------- xm_A(nplanes-ip+1) = xmm_A ym_A(nplanes-ip+1) = ymm_A + zm_A(nplanes-ip+1) = zmm_A xm_B(nplanes-ip+1) = xmm_B ym_B(nplanes-ip+1) = ymm_B + zm_B(nplanes-ip+1) = zmm_B zm(nplanes-ip+1) = (zmm_A+zmm_B)/2. +c$$$ zm(nplanes-ip+1) = +c$$$ $ z_mech_sensor(nplanes-ip+1,il,is)*1000./1.d4 dedxtrk_x(nplanes-ip+1) = dedxmmx !<<< dedxtrk_y(nplanes-ip+1) = dedxmmy !<<< * ----------------------------