/[PAMELA software]/gpamela/gpcal/gpcalv.F
ViewVC logotype

Diff of /gpamela/gpcal/gpcalv.F

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

revision 3.2 by pamela, Thu Dec 5 10:17:41 2002 UTC revision 3.3 by pamela, Wed Dec 17 11:32:48 2003 UTC
# Line 1  Line 1 
1  *  *
2  * $Id: gpcalv.F,v 3.1.1.1 2002/07/11 16:02:14 cafagna Exp $  * $Id: gpcalv.F,v 3.2 2002/12/05 10:17:41 pamela Exp $
3  *  *
4  * $Log: gpcalv.F,v $  * $Log: gpcalv.F,v $
5    * Revision 3.2  2002/12/05 10:17:41  pamela
6    * Update CAS and CALO geometries and positions. Makefile updated as well
7    *
8  * Revision 3.1.1.1  2002/07/11 16:02:14  cafagna  * Revision 3.1.1.1  2002/07/11 16:02:14  cafagna
9  * First GPAMELA release on CVS  * First GPAMELA release on CVS
10  *  *
# Line 107  C      CALL GSDVN ('CAST','CASI',NCASTR, Line 110  C      CALL GSDVN ('CAST','CASI',NCASTR,
110        Y = 0.        Y = 0.
111  *EM:  *EM:
112  *F.V.&ML:  *F.V.&ML:
113        CALL GPVOLU(-2)  c      CALL GPVOLU(-2)
114  C      Z = -CAPL(3) + CAKA(3)  C      Z = -CAPL(3) + CAKA(3)
115  C      CALL GSPOS('CAKA',N,'CAPL',X,Y,Z,0,'ONLY')  C      CALL GSPOS('CAKA',N,'CAPL',X,Y,Z,0,'ONLY')
116        Z = -CANS(3) + CAKA(3)        Z = -CANS(3) + CAKA(3)
# Line 227  C end comments. Line 230  C end comments.
230  *      *    
231           CALL GSPOS('CANS',N,'CALB',X,Y,Z,3,'ONLY')           CALL GSPOS('CANS',N,'CALB',X,Y,Z,3,'ONLY')
232           Z= Z - CANS(3) - CAPL(3)           Z= Z - CANS(3) - CAPL(3)
233           X=0.05           X=-0.05
234           Y=-0.10           Y=0.10
235  *  *
236  * Check if this detector is excluded  * Check if this detector is excluded
237  *  *
# Line 255  C end comments. Line 258  C end comments.
258           N= N + 1           N= N + 1
259  *  *
260  * Check if this plane is excluded  * Check if this plane is excluded
261           X = -0.10           X= -0.10
262           Y = -0.05           Y= -0.05
263  *  *
264           IF(.NOT.NOCAPL(N))           IF(.NOT.NOCAPL(N))
265       +        CALL GSPOS('CAPL',N,'CALB',X,Y,Z,0,'ONLY')       +        CALL GSPOS('CAPL',N,'CALB',X,Y,Z,0,'ONLY')
# Line 278  C end comments. Line 281  C end comments.
281  *  *
282           CALL GSPOS('CANS',N,'CALB',X,Y,Z,3,'ONLY')           CALL GSPOS('CANS',N,'CALB',X,Y,Z,3,'ONLY')
283           Z= Z - CANS(3) - CAPL(3)           Z= Z - CANS(3) - CAPL(3)
284           X = -0.05           X= 0.05
285           Y = -0.10           Y= -0.10
286  *  *
287  *  *
288  * Check if this detector is excluded  * Check if this detector is excluded
Legend:
Removed from v.3.2  
changed lines
  Added in v.3.3
  ViewVC Help
Powered by ViewVC 1.1.23