/[PAMELA software]/gpamela/gpspe/gpspev.F
ViewVC logotype

Diff of /gpamela/gpspe/gpspev.F

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3.6 by cafagna, Fri Dec 16 09:13:59 2005 UTC revision 3.9 by pam-ba, Fri Jun 30 15:38:16 2006 UTC
# Line 1  Line 1 
1    
2  *  *
3  * $Id: gpspev.F,v 3.5 2005/12/13 10:31:29 pam-ba Exp $  * $Id: gpspev.F,v 3.8 2006/05/02 12:02:43 bottai Exp $
4  *  *
5  * $Log: gpspev.F,v $  * $Log: gpspev.F,v $
6    * Revision 3.8  2006/05/02 12:02:43  bottai
7    * micrometric adjustment of spe geometry
8    *
9    * Revision 3.7  2005/12/16 10:20:23  cafagna
10    * Bug fixed in the new update
11    *
12    * Revision 3.6  2005/12/16 09:13:59  cafagna
13    * New small valume added to the tracker frame
14    *
15  * Revision 3.5  2005/12/13 10:31:29  pam-ba  * Revision 3.5  2005/12/13 10:31:29  pam-ba
16  * added a new volume, TPGI, in the spectrometer  * added a new volume, TPGI, in the spectrometer
17  *  *
# Line 132  C end ml. Line 141  C end ml.
141  *  *
142  * Positioning volume TSPA     into the mother TRSL  * Positioning volume TSPA     into the mother TRSL
143  *  *
144          GLUEX=XGLUE-0.0005
145          GLUEY=XGLUE
146        N= 1        N= 1
147        X= 0.        X= 0.
148        Y= 0.        Y= 0.
# Line 149  C #       Y=-TRPB(2)+1.5-0.225+TRCP(2) Line 160  C #       Y=-TRPB(2)+1.5-0.225+TRCP(2)
160  CC end ml.  CC end ml.
161  c      Z=-TRPB(3)+2*TPAI(3)+TRCP(3)  c      Z=-TRPB(3)+2*TPAI(3)+TRCP(3)
162        Z=TRPB(3)-2*TPAI(3)-TRCP(3)        Z=TRPB(3)-2*TPAI(3)-TRCP(3)
163        y=-0.225-TPAS(2)+TRCP(2)        y=-TPAS(2)+TRCP(2)
164  C # end CAF mod  C # end CAF mod
165        TPASSPACE=TPAS(1)-(3*TRSL(1)+4*TRCP(1)+3*XGLUE)        TPASSPACE=TPAS(1)-(3*TRSL(1)+4*TRCP(1)+3*GLUEX)
166        DO I=1,4        DO I=1,4
167  CC ml 20/04/05:          CC ml 20/04/05:        
168  CC         X=-TRPL(1)+(2*I-1)*TRCP(1)+2*(I-1)*TRSL(1)  CC         X=-TRPL(1)+(2*I-1)*TRCP(1)+2*(I-1)*TRSL(1)
# Line 164  C Ml. 15/12/05: introducing a space (alo Line 175  C Ml. 15/12/05: introducing a space (alo
175  c  aluminum frame and respectively the first and the last carbon fiber barrel.  c  aluminum frame and respectively the first and the last carbon fiber barrel.
176  c It is has been done increasing the dimension of TPAS along x:  c It is has been done increasing the dimension of TPAS along x:
177  C         X=-TPAS(1)+2*(I-1)*XGLUE+(2*I-1)*TRCP(1)+2*(I-1)*TRSL(1)  C         X=-TPAS(1)+2*(I-1)*XGLUE+(2*I-1)*TRCP(1)+2*(I-1)*TRSL(1)
178           X=-TPAS(1)+TPASSPACE+2*(I-1)*XGLUE+(2*I-1)*TRCP(1)+           X=-TPAS(1)+TPASSPACE+2*(I-1)*GLUEX+(2*I-1)*TRCP(1)+
179       +      2*(I-1)*TRSL(1)       +      2*(I-1)*TRSL(1)
180  CC end ml  CC end ml
181           CALL GSPOS('TRCP',I,'TPAS',X,Y,Z,0,'ONLY')           CALL GSPOS('TRCP',I,'TPAS',X,Y,Z,0,'ONLY')
# Line 183  c      Z=-TRPB(3)+2*TPAI(3)+TRCP(3) Line 194  c      Z=-TRPB(3)+2*TPAI(3)+TRCP(3)
194  c ml: 20/9/05 introducing the glue between TRCP and the silicon ladders.  c ml: 20/9/05 introducing the glue between TRCP and the silicon ladders.
195  c         X=-TPAS(1)+2*(MOD(I-1,3)+1)*TRCP(1)+  c         X=-TPAS(1)+2*(MOD(I-1,3)+1)*TRCP(1)+
196  c     +        (2*(MOD(I-1,3)+1)-1)*TRSL(1)  c     +        (2*(MOD(I-1,3)+1)-1)*TRSL(1)
197           X=-TPAS(1)+2*(MOD(I-1,3)+1)*TRCP(1)+           X=-TPAS(1)+TPASSPACE+2*(MOD(I-1,3)+1)*TRCP(1)+
198       +   (2*(MOD(I-1,3)+1)-1)*XGLUE+(2*(MOD(I-1,3)+1)-1)*TRSL(1)               +   (2*(MOD(I-1,3)+1)-1)*GLUEX+(2*(MOD(I-1,3)+1)-1)*TRSL(1)
199           IF(I.LE.3) THEN           IF(I.LE.3) THEN
200  C ml: 22/9/05:  C ml: 22/9/05:
201  c            Y=TPAS(2)-TRSL(2)  c            Y=TPAS(2)-TRSL(2)
202              Y=TPAS(2)-0.1485-TRSL(2)              Y=TPAS(2)-0.1485+0.0005-TRSL(2)
203           ELSE           ELSE
204  C            Y=TPAS(2)-3*TRSL(2)  C            Y=TPAS(2)-3*TRSL(2)
205              Y=TPAS(2)-0.1485-XGLUE-3*TRSL(2)              Y=TPAS(2)-0.1485-GLUEY-3*TRSL(2)
206           ENDIF           ENDIF
207           CALL GSPOS('TRSL',I,'TPAS',X,Y,Z,0,'ONLY')           CALL GSPOS('TRSL',I,'TPAS',X,Y,Z,0,'ONLY')
208        ENDDO        ENDDO
# Line 215  C #          X=-TRPB(1)+2.29+2*I*TRCP(1) Line 226  C #          X=-TRPB(1)+2.29+2*I*TRCP(1)
226  c ml: 21/9/05 introducing the glue between the carbon barrel and the silicon  c ml: 21/9/05 introducing the glue between the carbon barrel and the silicon
227  c       ladders  c       ladders
228  c         X=-TPAS(1)+2*I*TRCP(1)+(2*I-1)*THBP(1)  c         X=-TPAS(1)+2*I*TRCP(1)+(2*I-1)*THBP(1)
229           X=-TPAS(1)+2*I*TRCP(1)+(2*I-1)*THBP(1)+           X=-TPAS(1)+TPASSPACE+2*I*TRCP(1)+(2*I-1)*THBP(1)+
230       +      (2*(MOD(I-1,3)+1)-1)*XGLUE       +      (2*(MOD(I-1,3)+1)-1)*GLUEX
231           CALL GSPOS('THBP',I,'TPAS',X,Y,Z,0,'ONLY')           CALL GSPOS('THBP',I,'TPAS',X,Y,Z,0,'ONLY')
232        ENDDO        ENDDO
233  c end ml.  c end ml.
# Line 262  c end ml. Line 273  c end ml.
273        Y=0.        Y=0.
274        CALL GSPOS('TPGD',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGD',N,'MGFR',X,Y,Z,0,'ONLY')
275  *  *
 <<<<<<< gpspev.F  
276  * Positioning volume TPGI     into the mother MGFR under MGPL  * Positioning volume TPGI     into the mother MGFR under MGPL
277  *  *
278        N=1        N=1
# Line 271  c end ml. Line 281  c end ml.
281        Y=0.        Y=0.
282        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')
283  *  *
 =======  
 * Positioning volume TPGI     into the mother MGFR under MGPL  
 *  
       N=1  
       X=0.  
       Z=-MGFR(3)+2*TPGD(3)+TPGI(3)  
       Y=0.  
       CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')  
 *  
 >>>>>>> 3.5  
284  * Positioning volume MGPI     into the mother MGPL  * Positioning volume MGPI     into the mother MGPL
285  *  *
286        N= 1        N= 1
# Line 300  c      Z=-MGFR(3)+MGPL(3) Line 300  c      Z=-MGFR(3)+MGPL(3)
300        Z=-MGFR(3)+2*(TPGD(3)+TPGI(3))+MGPL(3)        Z=-MGFR(3)+2*(TPGD(3)+TPGI(3))+MGPL(3)
301        CALL GSPOS('MGPL',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('MGPL',N,'MGFR',X,Y,Z,0,'ONLY')
302  *  *
 <<<<<<< gpspev.F  
303  * Positioning volume TPGI     into the mother MGFR above MGPL  * Positioning volume TPGI     into the mother MGFR above MGPL
304  *  *
305        N=2        N=2
# Line 309  c      Z=-MGFR(3)+MGPL(3) Line 308  c      Z=-MGFR(3)+MGPL(3)
308        Y=0.        Y=0.
309        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')
310  *  *
 =======  
 * Positioning volume TPGI     into the mother MGFR over MGPL  
 *  
       N=2  
       X=0.  
       Z=-MGFR(3)+2*(TPGD(3)+TPGI(3)+MGPL(3))+TPGI(3)  
       Y=0.  
       CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')  
 *  
 >>>>>>> 3.5  
311  * Positioning volume TPGA     into the mother MGFR  * Positioning volume TPGA     into the mother MGFR
312  *  *
313  C ML: 10/11/05  C ML: 10/11/05
# Line 391  C DTBAL is the distance along x of the v Line 380  C DTBAL is the distance along x of the v
380  * Positioning volume TPGU     into the mother MGFR  * Positioning volume TPGU     into the mother MGFR
381  *  *
382        X=0.        X=0.
 <<<<<<< gpspev.F  
383  C      Z=MGFR(3)-TPGU(3)  C      Z=MGFR(3)-TPGU(3)
384        Z=-MGFR(3)+2*(TPGD(3)+TPGI(3)+MGPL(3)+TPGI(3)+TPGA(3)+TRPB(3))+        Z=-MGFR(3)+2*(TPGD(3)+TPGI(3)+MGPL(3)+TPGI(3)+TPGA(3)+TRPB(3))+
385       +   TPGU(3)             +   TPGU(3)      
 =======  
 C      Z=MGFR(3)-TPGU(3)  
       Z=-MGFR(3)+2*(TPGD(3)+TPGI(3)+MGPL(3)+TPGI(3)+TPGA(3)+TRPB(3))+  
      +   TPGU(3)  
 >>>>>>> 3.5  
386        Y=-MGFR(2)+TRPB(2)        Y=-MGFR(2)+TRPB(2)
387        CALL GSPOS('TPGU',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGU',N,'MGFR',X,Y,Z,0,'ONLY')
388  *  *

Legend:
Removed from v.3.6  
changed lines
  Added in v.3.9

  ViewVC Help
Powered by ViewVC 1.1.23