/[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.8 by bottai, Tue May 2 12:02:43 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.7 2005/12/16 10:20:23 cafagna Exp $
4    *
5    * $Log: gpspev.F,v $
6    * Revision 3.7  2005/12/16 10:20:23  cafagna
7    * Bug fixed in the new update
8    *
9    * Revision 3.6  2005/12/16 09:13:59  cafagna
10    * New small valume added to the tracker frame
11  *  *
 * $Log: gpspev.F,v $  
12  * Revision 3.5  2005/12/13 10:31:29  pam-ba  * Revision 3.5  2005/12/13 10:31:29  pam-ba
13  * added a new volume, TPGI, in the spectrometer  * added a new volume, TPGI, in the spectrometer
14  *  *
# Line 132  C end ml. Line 138  C end ml.
138  *  *
139  * Positioning volume TSPA     into the mother TRSL  * Positioning volume TSPA     into the mother TRSL
140  *  *
141          GLUEX=XGLUE-0.0005
142          GLUEY=XGLUE
143        N= 1        N= 1
144        X= 0.        X= 0.
145        Y= 0.        Y= 0.
# Line 149  C #       Y=-TRPB(2)+1.5-0.225+TRCP(2) Line 157  C #       Y=-TRPB(2)+1.5-0.225+TRCP(2)
157  CC end ml.  CC end ml.
158  c      Z=-TRPB(3)+2*TPAI(3)+TRCP(3)  c      Z=-TRPB(3)+2*TPAI(3)+TRCP(3)
159        Z=TRPB(3)-2*TPAI(3)-TRCP(3)        Z=TRPB(3)-2*TPAI(3)-TRCP(3)
160        y=-0.225-TPAS(2)+TRCP(2)        y=-TPAS(2)+TRCP(2)
161  C # end CAF mod  C # end CAF mod
162        TPASSPACE=TPAS(1)-(3*TRSL(1)+4*TRCP(1)+3*XGLUE)        TPASSPACE=TPAS(1)-(3*TRSL(1)+4*TRCP(1)+3*GLUEX)
163        DO I=1,4        DO I=1,4
164  CC ml 20/04/05:          CC ml 20/04/05:        
165  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 172  C Ml. 15/12/05: introducing a space (alo
172  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.
173  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:
174  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)
175           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)+
176       +      2*(I-1)*TRSL(1)       +      2*(I-1)*TRSL(1)
177  CC end ml  CC end ml
178           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 191  c      Z=-TRPB(3)+2*TPAI(3)+TRCP(3)
191  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.
192  c         X=-TPAS(1)+2*(MOD(I-1,3)+1)*TRCP(1)+  c         X=-TPAS(1)+2*(MOD(I-1,3)+1)*TRCP(1)+
193  c     +        (2*(MOD(I-1,3)+1)-1)*TRSL(1)  c     +        (2*(MOD(I-1,3)+1)-1)*TRSL(1)
194           X=-TPAS(1)+2*(MOD(I-1,3)+1)*TRCP(1)+  
195       +   (2*(MOD(I-1,3)+1)-1)*XGLUE+(2*(MOD(I-1,3)+1)-1)*TRSL(1)          
196             X=-TPAS(1)+TPASSPACE+2*(MOD(I-1,3)+1)*TRCP(1)+
197         +   (2*(MOD(I-1,3)+1)-1)*GLUEX+(2*(MOD(I-1,3)+1)-1)*TRSL(1)        
198           IF(I.LE.3) THEN           IF(I.LE.3) THEN
199  C ml: 22/9/05:  C ml: 22/9/05:
200  c            Y=TPAS(2)-TRSL(2)  c            Y=TPAS(2)-TRSL(2)
201              Y=TPAS(2)-0.1485-TRSL(2)              Y=TPAS(2)-0.1485+0.0005-TRSL(2)
202           ELSE           ELSE
203  C            Y=TPAS(2)-3*TRSL(2)  C            Y=TPAS(2)-3*TRSL(2)
204              Y=TPAS(2)-0.1485-XGLUE-3*TRSL(2)              Y=TPAS(2)-0.1485-GLUEY-3*TRSL(2)
205           ENDIF           ENDIF
206           CALL GSPOS('TRSL',I,'TPAS',X,Y,Z,0,'ONLY')           CALL GSPOS('TRSL',I,'TPAS',X,Y,Z,0,'ONLY')
207        ENDDO        ENDDO
# Line 215  C #          X=-TRPB(1)+2.29+2*I*TRCP(1) Line 225  C #          X=-TRPB(1)+2.29+2*I*TRCP(1)
225  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
226  c       ladders  c       ladders
227  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)
228           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)+
229       +      (2*(MOD(I-1,3)+1)-1)*XGLUE       +      (2*(MOD(I-1,3)+1)-1)*GLUEX
230           CALL GSPOS('THBP',I,'TPAS',X,Y,Z,0,'ONLY')           CALL GSPOS('THBP',I,'TPAS',X,Y,Z,0,'ONLY')
231        ENDDO        ENDDO
232  c end ml.  c end ml.
# Line 262  c end ml. Line 272  c end ml.
272        Y=0.        Y=0.
273        CALL GSPOS('TPGD',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGD',N,'MGFR',X,Y,Z,0,'ONLY')
274  *  *
 <<<<<<< gpspev.F  
275  * Positioning volume TPGI     into the mother MGFR under MGPL  * Positioning volume TPGI     into the mother MGFR under MGPL
276  *  *
277        N=1        N=1
# Line 271  c end ml. Line 280  c end ml.
280        Y=0.        Y=0.
281        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')
282  *  *
 =======  
 * 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  
283  * Positioning volume MGPI     into the mother MGPL  * Positioning volume MGPI     into the mother MGPL
284  *  *
285        N= 1        N= 1
# Line 300  c      Z=-MGFR(3)+MGPL(3) Line 299  c      Z=-MGFR(3)+MGPL(3)
299        Z=-MGFR(3)+2*(TPGD(3)+TPGI(3))+MGPL(3)        Z=-MGFR(3)+2*(TPGD(3)+TPGI(3))+MGPL(3)
300        CALL GSPOS('MGPL',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('MGPL',N,'MGFR',X,Y,Z,0,'ONLY')
301  *  *
 <<<<<<< gpspev.F  
302  * Positioning volume TPGI     into the mother MGFR above MGPL  * Positioning volume TPGI     into the mother MGFR above MGPL
303  *  *
304        N=2        N=2
# Line 309  c      Z=-MGFR(3)+MGPL(3) Line 307  c      Z=-MGFR(3)+MGPL(3)
307        Y=0.        Y=0.
308        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')
309  *  *
 =======  
 * 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  
310  * Positioning volume TPGA     into the mother MGFR  * Positioning volume TPGA     into the mother MGFR
311  *  *
312  C ML: 10/11/05  C ML: 10/11/05
# Line 391  C DTBAL is the distance along x of the v Line 379  C DTBAL is the distance along x of the v
379  * Positioning volume TPGU     into the mother MGFR  * Positioning volume TPGU     into the mother MGFR
380  *  *
381        X=0.        X=0.
 <<<<<<< gpspev.F  
382  C      Z=MGFR(3)-TPGU(3)  C      Z=MGFR(3)-TPGU(3)
383        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))+
384       +   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  
385        Y=-MGFR(2)+TRPB(2)        Y=-MGFR(2)+TRPB(2)
386        CALL GSPOS('TPGU',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGU',N,'MGFR',X,Y,Z,0,'ONLY')
387  *  *
Legend:
Removed from v.3.6  
changed lines
  Added in v.3.8
  ViewVC Help
Powered by ViewVC 1.1.23