/[PAMELA software]/gpamela/gpcal/gpdcal.F

Diff of /gpamela/gpcal/gpdcal.F

Parent Directory | Revision Log | View Patch Patch

-revision 3.4 by cafagna,
Mon Jul 25 11:53:20 2005 UTC
+revision 3.7 by cafagna,
Thu May 11 23:52:55 2006 UTC
 Line 1
  *
- * $Id: gpdcal.F,v 3.3 2005/06/21 02:42:03 cafagna Exp $
+ * $Id: gpdcal.F,v 3.6 2006/05/11 00:39:39 cafagna Exp $
  *
  * $Log: gpdcal.F,v $
+ * Revision 3.6  2006/05/11 00:39:39  cafagna
+ * A bug in hits retrival for calorimeter
+ *
+ * Revision 3.5  2006/05/11 00:15:34  cafagna
+ * A bug in hits retrival for calorimeter
+ *
+ * Revision 3.4  2005/07/25 11:53:20  cafagna
+ * Several updates. See history for details
+ *
  * Revision 3.3  2005/06/21 02:42:03  cafagna
  * Major modification to the geometry and to the random number chain
  *
- * Revision 3.2  2003/12/17 11:32:48  pamela
+ *     Revision 3.2 2003/12/17 11:32:48 pamela CALO SIMULATION COMPLETED:
- * CALO SIMULATION COMPLETED: geometry and special tracking parameters updated and simulation checked by a comparison with the Trieste's standalone Monte Carlo simulation
+ *     geometry and special tracking parameters updated and simulation
+ *     checked by a comparison with the Trieste's standalone Monte Carlo
+ *     simulation
  *
  * Revision 3.1.1.1  2002/07/11 16:02:14  cafagna
  * First GPAMELA release on CVS
-Line 30
+Line 41
  *                                                                      *
  ************************************************************************
  #include "gcunit.inc"
+ #include "gcflag.inc"
  #include "gpphit.inc"
-       PARAMETER (NH=NHCAL,NHM=NHMCAL,NVOL=3,NVOL1=2)
+       PARAMETER (NH1=NHCALI,NHM1=NHMCALI,NVOL1=2)
+       PARAMETER (NH=NHCAL,NHM=NHMCAL,NVOL=3)
  #include "gprhit.inc"
  #include "gpcal.inc"
  #include "gpsed.inc"
-Line 43
+Line 56
  *
        INTEGER IS,ID,NV,NVM,NNHM
        CHARACTER*4 CSET
-       INTEGER NUMD1(NVOL1),NUMBV1(NVOL1,NHM)
+       INTEGER ITRA1(NHM1),NUMD1(NVOL1),NUMBV1(NVOL1,NHM1)
+       REAL VHITS1(NH1,NHM1)
  *
  * Vector zeroed
  *
-Line 58
+Line 72
        CALL VZERO(NUMD  ,NVOL)
        CALL VZERO(NUMD1 ,NVOL1)
  c ml:16/4/2003
-       CALL VZERO(ICASTRIP,NHMCAL)
+       CALL VZERO(ICASTRIP,NHMCALI)
-       CALL VZERO(ICAPLANE,NHMCAL)
+       CALL VZERO(ICAPLANE,NHMCALI)
-       CALL VZERO(ICAMOD,NHMCAL)
+       CALL VZERO(ICAMOD,NHMCALI)
-       CALL VZERO(ENESTRIP,NHMCAL)
+       CALL VZERO(ENESTRIP,NHMCALI)
  c end 16/4/2003
  *
-       NV = NVOL
-       NVM= NVMAX
  *
  * The tungsten plane case
  *
+       NV = NVOL
+       NVM= NVMAX
        IS   = ISCAL
        ID   = IDCAST
        IT = -1
-Line 89 
 c end 16/4/2003
+Line 103 
 c end 16/4/2003
  * Update the max number of hits to be retrived
  *
        NNHM = NHM
-       IF(NNHM.LE.0) THEN
+ c$$$      IF(NNHM.LE.0) THEN
-          WRITE(CHMAIL,10100) CSET,CNSED(IS,ID),NTHCAL,NHM,
+ c$$$         WRITE(CHMAIL,10100) CSET,CNSED(IS,ID),NTHCAL,NHM,
-      +                        IDRUN,IDEVT
+ c$$$     +                        IDRUN,IDEVT
-          CALL GMAIL(1,0)
+ c$$$         CALL GMAIL(1,0)
-          GO TO 10
+ c$$$         GO TO 10
-       ENDIF
+ c$$$      ENDIF
        CALL VZERO(NUMBV,NVOL*NHM)
        CALL GPRHIT(CSET,CNSED(IS,ID),IS,ID,NVOL,NH,NNHM,1,
       +           IT,NUMD,ITRA,NUMBV,VHITS,NHITS)
  *
  * If there was a problem in GPRHIT then exit
  *
+       NTHCAL=0
        IF(NHITS.LT.0) THEN
           WRITE(CHMAIL,10200) CSET,CNSED(IS,ID),NHITS,NHM,
       +                        IDRUN,IDEVT
           CALL GMAIL(1,0)
-          GO TO 10
+          NHITS = NNHM
        ENDIF
  *
  * >>>>>>>>>>>>>>>>>>>>>> DIGI action
-Line 113 
 c end 16/4/2003
+Line 128 
 c end 16/4/2003
  *
  * Fill the CWN common
  *
-       NTHCAL=0
        DO I=1,NHITS
           NTHCAL = NTHCAL + 1
           ICAPL(NTHCAL) = NUMBV((NVCAL-2),I)
-Line 123 
 c end 16/4/2003
+Line 137 
 c end 16/4/2003
           YINCAL(NTHCAL) = VHITS(2,I)
           ZINCAL(NTHCAL) = VHITS(3,I)
           ERELCAL(NTHCAL) = VHITS(4,I)
- c         IPARCAL(NTHCAL) = VHITS(5,I)
- c         P0CAL(NTHCAL) = VHITS(6,I)
        ENDDO
  C
  C The energy released per strip
-Line 138 
 C
+Line 150 
 C
        ID   = IDCASI
        IT = -1
        CSET = 'CAL '
  *
  * Check on the volume level
  *
        IF (NV.GT.NVM) THEN
-Line 147 
 C
+Line 159 
 C
           CALL GMAIL(1,0)
           GO TO 10
        ENDIF
-       CALL VZERO(VHITS,NH*NHM)
+       CALL VZERO(VHITS1,NH1*NHM1)
-       CALL VZERO(ITRA ,NHM)
+       CALL VZERO(ITRA1 ,NHM1)
        NHITS = -1
  *
  * Update the max number of hits to be retrived
  *
-       NNHM = NHM
+       NNHM = NHM1
        IF(NNHM.LE.0) THEN
           WRITE(CHMAIL,10100) CSET,CNSED(IS,ID),NTHCALI,NHM,
       +                        IDRUN,IDEVT
           CALL GMAIL(1,0)
           GO TO 10
        ENDIF
-       CALL VZERO(NUMBV,NVOL*NHM)
+       CALL VZERO(NUMBV1,NVOL1*NHM1)
-       CALL GPRHIT(CSET,CNSED(IS,ID),IS,ID,NVOL,NH,NNHM,1,
+       CALL GPRHIT(CSET,CNSED(IS,ID),IS,ID,NVOL1,NH1,NNHM,1,
-      +           IT,NUMD,ITRA,NUMBV,VHITS,NHITS)
+      +           IT,NUMD1,ITRA1,NUMBV1,VHITS1,NHITS)
  *
  * If there was a problem in GPRHIT then exit
  *
+       NTHCALI=0
        IF(NHITS.LT.0) THEN
           WRITE(CHMAIL,10200) CSET,CNSED(IS,ID),NHITS,NHM,
       +                        IDRUN,IDEVT
-Line 179 
 C
+Line 192 
 C
  * Fill the CWN common
  *
  c
-       NTHCALI=0
        DO I=1,NHITS
           NTHCALI=NTHCALI+1
-          ICASTRIP(NTHCALI)=NUMBV(NVCALI,I)
+          ICASTRIP(NTHCALI)=NUMBV1(NVCALI,I)
-          ICAPLANE(NTHCALI)=NUMBV((NVCALI-1),I)
+          ICAPLANE(NTHCALI)=NUMBV1((NVCALI-1),I)
-          ICAMOD(NTHCALI)=VHITS(1,I)
+          ICAMOD(NTHCALI)=VHITS1(1,I)
-          ENESTRIP(NTHCALI)=VHITS(2,I)
+          ENESTRIP(NTHCALI)=VHITS1(2,I)
        ENDDO
  c
 FORMAT(' GPDCAL: VOLUME level too big: SET=',A4,', DET=',A4,',

 Legend:



Removed from v.3.4
 


changed lines


 
Added in v.3.7
 Legend:



Removed from v.3.4
 


changed lines


 
Added in v.3.7
-Removed from v.3.4
+Added in v.3.7

	ViewVC Help
Powered by ViewVC 1.1.23