/[PAMELA software]/DarthVader/TrackerLevel2/src/F77/mini.f
ViewVC logotype

Diff of /DarthVader/TrackerLevel2/src/F77/mini.f

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

revision 1.17 by pam-fi, Thu May 24 13:29:09 2007 UTC revision 1.19 by pam-fi, Wed Jun 6 09:26:09 2007 UTC
# Line 67  c--------------------------------------- Line 67  c---------------------------------------
67                    
68  c      LOGICAL TRKDEBUG,TRKVERBOSE  c      LOGICAL TRKDEBUG,TRKVERBOSE
69  c      COMMON/TRKD/TRKDEBUG,TRKVERBOSE  c      COMMON/TRKD/TRKDEBUG,TRKVERBOSE
70        LOGICAL TRKDEBUG,TRKVERBOSE,STUDENT        LOGICAL TRKDEBUG,TRKVERBOSE,STUDENT,FIRSTSTEPS,FIRSTSTUDENT
71        COMMON/TRKD/TRKDEBUG,TRKVERBOSE        COMMON/TRKD/TRKDEBUG,TRKVERBOSE
72    
73        DIMENSION AL0(5)        DIMENSION AL0(5)
# Line 76  c      COMMON/TRKD/TRKDEBUG,TRKVERBOSE Line 76  c      COMMON/TRKD/TRKDEBUG,TRKVERBOSE
76  *     define kind of minimization (0x=chi2+gaussian or 1x=likelihood+student)  *     define kind of minimization (0x=chi2+gaussian or 1x=likelihood+student)
77  *  *
78        STUDENT = .false.        STUDENT = .false.
79          FIRSTSTEPS = .true.
80          FIRSTSTUDENT = .true.
81        IF(MOD(INT(TRACKMODE/10),10).EQ.1) STUDENT = .true.        IF(MOD(INT(TRACKMODE/10),10).EQ.1) STUDENT = .true.
82    
83        IF(IPRINT.EQ.1) THEN        IF(IPRINT.EQ.1) THEN
# Line 144  c$$$      DELETA2 = 0.016/0.3/0.4/0.4451 Line 146  c$$$      DELETA2 = 0.016/0.3/0.4/0.4451
146  * **** Chi2+gaussian minimization  * **** Chi2+gaussian minimization
147  * -------------------------------  * -------------------------------
148    
149        IF(.NOT.STUDENT) THEN        IF((.NOT.STUDENT).OR.FIRSTSTEPS) THEN
150    
151             IF(ISTEP.GE.3) FIRSTSTEPS = .false.
152    
153           CALL CHISQ(IFLAG,JFAIL) !chi^2 and its derivatives           CALL CHISQ(IFLAG,JFAIL) !chi^2 and its derivatives
154           IF(JFAIL.NE.0) THEN           IF(JFAIL.NE.0) THEN
# Line 252  c$$$         PRINT*,'CHI2DOLD ',(CHI2DOL Line 256  c$$$         PRINT*,'CHI2DOLD ',(CHI2DOL
256  * **** Likelihood+Student minimization  * **** Likelihood+Student minimization
257  * -------------------------------  * -------------------------------
258    
259        IF(STUDENT) THEN        IF(STUDENT.AND.(.NOT.FIRSTSTEPS)) THEN
260    
261             IF(FIRSTSTUDENT) THEN
262                FIRSTSTUDENT = .false.
263                ISTEP = 1
264             ENDIF
265    
266           CALL CHISQSTT(1,JFAIL)           CALL CHISQSTT(1,JFAIL)
267           DO I=1,5                                         DO I=1,5                              
268              DAL(I)=0.                        DAL(I)=0.          
# Line 286  c$$$         PRINT*,CHI2 Line 296  c$$$         PRINT*,CHI2
296           FC = CHI2           FC = CHI2
297           EC = 0.           EC = 0.
298    
299             ICOUNT = 0
300   100     CONTINUE   100     CONTINUE
301             ICOUNT = ICOUNT+1
302    
303           DO I=1,5           DO I=1,5
304              AL0(I)=AL(I)              AL0(I)=AL(I)
305           ENDDO           ENDDO
# Line 330  c$$$         PRINT*,E,CHI2_NEW Line 343  c$$$         PRINT*,E,CHI2_NEW
343              ENDIF              ENDIF
344  c$$$            E = BETA*E  c$$$            E = BETA*E
345           ENDIF           ENDIF
346             IF(ICOUNT.GT.20) GOTO 101
347           GOTO 100           GOTO 100
348    
349   101     CONTINUE   101     CONTINUE
Legend:
Removed from v.1.17  
changed lines
  Added in v.1.19
  ViewVC Help
Powered by ViewVC 1.1.23