(file) Return to init.f CVS log (file) (dir) Up to [HallC] / simc_semi

Diff for /simc_semi/init.f between version 1.1 and 1.3

version 1.1, 2004/04/23 18:13:18 version 1.3, 2006/05/03 21:56:10
Line 49 
Line 49 
         energy = ebeam         energy = ebeam
         call trip_thru_target (1,zero,energy,zero,targ.Eloss(1).ave,         call trip_thru_target (1,zero,energy,zero,targ.Eloss(1).ave,
      >                         targ.teff(1).ave,Me,4)      >                         targ.teff(1).ave,Me,4)
         energy = Pe_cent**2          energy = Pe_cent
         call trip_thru_target (2,zero,energy,the_cent,targ.Eloss(2).ave,         call trip_thru_target (2,zero,energy,the_cent,targ.Eloss(2).ave,
      >                         targ.teff(2).ave,Me,4)      >                         targ.teff(2).ave,Me,4)
         energy = sqrt(Pp_cent**2 + Mh2)         energy = sqrt(Pp_cent**2 + Mh2)
Line 358 
Line 358 
 !    E_rec=sqrt(M_rec**2+P_rec**2), and P_rec = -P_m !    E_rec=sqrt(M_rec**2+P_rec**2), and P_rec = -P_m
  
         if (doing_hyd_elast .or. doing_hydpi .or. doing_hydkaon .or.         if (doing_hyd_elast .or. doing_hydpi .or. doing_hydkaon .or.
         1                               doing_hyddelta .or. doing_hydrho) then          1    doing_hyddelta .or. doing_hydrho .or. doing_semi) then
           VERTEXedge.Mrec.min = 0.0           VERTEXedge.Mrec.min = 0.0
           VERTEXedge.Mrec.max = 0.0           VERTEXedge.Mrec.max = 0.0
           VERTEXedge.Trec.min = 0.0           VERTEXedge.Trec.min = 0.0
Line 377 
Line 377 
 ! upper limit, since the lower limit is determined by the allowed radiation, ! upper limit, since the lower limit is determined by the allowed radiation,
 ! which is not calculated yet (and needs Trec to be calculated). ! which is not calculated yet (and needs Trec to be calculated).
  
         if (doing_eep) then          if (doing_eep .or. doing_semi) then
           VERTEXedge.Trec_struck.min = 0.           VERTEXedge.Trec_struck.min = 0.
           VERTEXedge.Trec_struck.max = 0.           VERTEXedge.Trec_struck.max = 0.
         else         else
Line 434 
Line 434 
           gen.sumEgen.min = max(gen.sumEgen.min,edge.e.E.min+edge.p.E.min)           gen.sumEgen.min = max(gen.sumEgen.min,edge.e.E.min+edge.p.E.min)
  
         else if (doing_semi) then         else if (doing_semi) then
            gen.sumEgen.max = Ebeam_max - VERTEXedge.Trec.min - VERTEXedge.Trec_struck.min  c          gen.sumEgen.max = Ebeam_max - VERTEXedge.Trec.min - VERTEXedge.Trec_struck.min
            gen.sumEgen.min = Ebeam_min - VERTEXedge.Trec.max - VERTEXedge.Trec_struck.max  c          gen.sumEgen.min = Ebeam_min - VERTEXedge.Trec.max - VERTEXedge.Trec_struck.max
              gen.sumEgen.max = Ebeam_max + targ.Mtar_struck - targ.Mrec_struck
              gen.sumEgen.min = edge.e.E.min + edge.p.E.min
  
         else                            !generated ELECTRON energy limits.         else                            !generated ELECTRON energy limits.
           gen.sumEgen.max = Ebeam_max + targ.Mtar_struck - targ.Mrec_struck -           gen.sumEgen.max = Ebeam_max + targ.Mtar_struck - targ.Mrec_struck -


Legend:
Removed from v.1.1  
changed lines
  Added in v.1.3

Analyzer/Replay: Mark Jones, Documents: Stephen Wood
Powered by
ViewCVS 0.9.2-cvsgraph-1.4.0