/[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.7 by cafagna, Fri Dec 16 10:20:23 2005 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.6 2005/12/16 09:13:59 cafagna Exp $
4    *
5    * $Log: gpspev.F,v $
6    * Revision 3.6  2005/12/16 09:13:59  cafagna
7    * New small valume added to the tracker frame
8  *  *
 * $Log: gpspev.F,v $  
9  * Revision 3.5  2005/12/13 10:31:29  pam-ba  * Revision 3.5  2005/12/13 10:31:29  pam-ba
10  * added a new volume, TPGI, in the spectrometer  * added a new volume, TPGI, in the spectrometer
11  *  *
# Line 262  c end ml. Line 265  c end ml.
265        Y=0.        Y=0.
266        CALL GSPOS('TPGD',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGD',N,'MGFR',X,Y,Z,0,'ONLY')
267  *  *
 <<<<<<< gpspev.F  
268  * Positioning volume TPGI     into the mother MGFR under MGPL  * Positioning volume TPGI     into the mother MGFR under MGPL
269  *  *
270        N=1        N=1
# Line 271  c end ml. Line 273  c end ml.
273        Y=0.        Y=0.
274        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')
275  *  *
 =======  
 * 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  
276  * Positioning volume MGPI     into the mother MGPL  * Positioning volume MGPI     into the mother MGPL
277  *  *
278        N= 1        N= 1
# Line 300  c      Z=-MGFR(3)+MGPL(3) Line 292  c      Z=-MGFR(3)+MGPL(3)
292        Z=-MGFR(3)+2*(TPGD(3)+TPGI(3))+MGPL(3)        Z=-MGFR(3)+2*(TPGD(3)+TPGI(3))+MGPL(3)
293        CALL GSPOS('MGPL',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('MGPL',N,'MGFR',X,Y,Z,0,'ONLY')
294  *  *
 <<<<<<< gpspev.F  
295  * Positioning volume TPGI     into the mother MGFR above MGPL  * Positioning volume TPGI     into the mother MGFR above MGPL
296  *  *
297        N=2        N=2
# Line 309  c      Z=-MGFR(3)+MGPL(3) Line 300  c      Z=-MGFR(3)+MGPL(3)
300        Y=0.        Y=0.
301        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGI',N,'MGFR',X,Y,Z,0,'ONLY')
302  *  *
 =======  
 * 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  
303  * Positioning volume TPGA     into the mother MGFR  * Positioning volume TPGA     into the mother MGFR
304  *  *
305  C ML: 10/11/05  C ML: 10/11/05
# Line 391  C DTBAL is the distance along x of the v Line 372  C DTBAL is the distance along x of the v
372  * Positioning volume TPGU     into the mother MGFR  * Positioning volume TPGU     into the mother MGFR
373  *  *
374        X=0.        X=0.
 <<<<<<< gpspev.F  
375  C      Z=MGFR(3)-TPGU(3)  C      Z=MGFR(3)-TPGU(3)
376        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))+
377       +   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  
378        Y=-MGFR(2)+TRPB(2)        Y=-MGFR(2)+TRPB(2)
379        CALL GSPOS('TPGU',N,'MGFR',X,Y,Z,0,'ONLY')        CALL GSPOS('TPGU',N,'MGFR',X,Y,Z,0,'ONLY')
380  *  *
Legend:
Removed from v.3.6  
changed lines
  Added in v.3.7
  ViewVC Help
Powered by ViewVC 1.1.23