--- calo/unpacking/calunpack.for 2005/12/05 16:23:20 1.1 +++ calo/unpacking/calunpack.for 2006/06/29 12:50:43 1.3 @@ -1,10 +1,14 @@ C C Written by Emiliano Mocchiutti and Mirko Boezio C -C * Version: 3.4.06 * +C * Version: 3.4.08 * C C Changelog: C +C 3.4.07 - 3.4.08: (2006-06-29) XO is rotated, not XE!! fixed. +C +C 3.4.06 - 3.4.07: (2006-06-29) save CRC values in calselftrig(section,1) and calselftrig(section,2) in case of CRC errors +C C 3.4.05 - 3.4.06: (2005-01-12) section order wrong in CLEARSEC, fixed. C C 3.4.04 - 3.4.05: (2005-01-05) XE is section y odd not even, fixed. @@ -774,16 +778,20 @@ endif C if (check.ne.vect(length)) then - merror(contr) = 132 - chi = chi + 4 - lleng = 0 - length2 = 0 - length = 0 C C clear vectors of that section in the common C call clearsec C + calselftrig(k,1) = check + calselftrig(k,2) = vect(length) +c + merror(contr) = 132 + chi = chi + 4 + lleng = 0 + length2 = 0 + length = 0 +c if (ke.eq.1.and.headcor.ne.2) then ic = 10 elseif (headcor.eq.2) then @@ -924,19 +932,19 @@ C DO I = 1,11 DO J = 1,96 - DEXY(2,2*I,J) = DEDX2(I,J) + DEXY(2,2*I,97-J) = DEDX2(I,J) DEXY(1,2*I-1,J) = DEDX4(I,J) - DEXY(2,2*I-1,97-J) = DEDX1(I,J) + DEXY(2,2*I-1,J) = DEDX1(I,J) DEXY(1,2*I,J) = DEDX3(I,J) - DEXYC(2,2*I,J) = DEDX2C(I,J) + DEXYC(2,2*I,97-J) = DEDX2C(I,J) DEXYC(1,2*I-1,J) = DEDX4C(I,J) - DEXYC(2,2*I-1,97-J) = DEDX1C(I,J) + DEXYC(2,2*I-1,J) = DEDX1C(I,J) DEXYC(1,2*I,J) = DEDX3C(I,J) enddo do j = 1,6 - base(2,2*i,j) = base2(i,j) + base(2,2*i,7-j) = base2(i,j) base(1,2*i-1,j) = base4(i,j) - base(2,2*i-1,7-j) = base1(i,j) + base(2,2*i-1,j) = base1(i,j) base(1,2*i,j) = base3(i,j) enddo enddo @@ -1412,12 +1420,12 @@ DEXYC(1,2*I-1,J) = 0. endif if (contr.eq.1) then - DEXY(2,2*I-1,97-J) = 0. - DEXYC(2,2*I-1,97-J) = 0. + DEXY(2,2*I-1,J) = 0. + DEXYC(2,2*I-1,J) = 0. endif if (contr.eq.2) then - DEXY(2,2*I,J) = 0. - DEXYC(2,2*I,J) = 0. + DEXY(2,2*I,97-J) = 0. + DEXYC(2,2*I,97-J) = 0. endif enddo do j = 1,6