Print

Print


Commit in lcio on MAIN
examples/f77/lciohbook/lciohbook.F+8-31.3 -> 1.4
src/cpp/include/CPPFORT/lcmcp.h+6-61.5 -> 1.6
src/cpp/src/CPPFORT/lcmcp.cc+3-31.6 -> 1.7
src/f77/lciof77api.inc+3-21.34 -> 1.35
src/latex/manual/f77summary.tex+3-31.17 -> 1.18
+23-17
5 modified files
mods for MCParticleImpl (mass,energy,momentum to double)

lcio/examples/f77/lciohbook
lciohbook.F 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- lciohbook.F	10 Nov 2003 11:18:18 -0000	1.3
+++ lciohbook.F	22 Mar 2006 16:42:37 -0000	1.4
@@ -26,6 +26,7 @@
       integer status, ievent
       integer i,j,k, nmcp, lenocc
       real costh, p(3), pxy, ptot, phi
+      double precision pdouble(3)
       character*80 filename
       character*80 mcpcolname
       data mcpcolname /'MCParticle'/
@@ -86,8 +87,11 @@
                      goto 10
                   endif
                   
-                  call hfill( 10, lcmcpgetenergy( mcp ), 0. , 1. )
-                  status = lcmcpgetmomentum( mcp , p )
+                  call hfill( 10, real(lcmcpgetenergy(mcp)), 0., 1.)
+                  status = lcmcpgetmomentum( mcp , pdouble )
+                  p(1) = pdouble(1)
+                  p(2) = pdouble(2)
+                  p(3) = pdouble(3)
                   
                   pxy = sqrt( p(1)*p(1)+p(2)*p(2) ) 
                   ptot = sqrt( p(1)*p(1)+p(2)*p(2)+p(3)*p(3) )
@@ -103,7 +107,8 @@
                      write(*,*) phi, ' - ' ,lcmcpgetpdg( mcp )
                   endif
 
-                  call hfill( 30, lcmcpgetenergy( mcp )/ptot , 0. , 1. )
+                  call hfill
+     &              ( 30, real(lcmcpgetenergy(mcp))/ptot , 0., 1.)
 
                endif
  10            continue

lcio/src/cpp/include/CPPFORT
lcmcp.h 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- lcmcp.h	15 Apr 2005 08:37:34 -0000	1.5
+++ lcmcp.h	22 Mar 2006 16:42:38 -0000	1.6
@@ -22,10 +22,10 @@
 int lcmcpgetsimulatorstatus( PTRTYPE mcparticle )  ;
 int lcmcpgetvertex( PTRTYPE mcparticle, double* vtx )  ;
 float lcmcpgettime( PTRTYPE mcparticle )  ;
-int lcmcpgetmomentum( PTRTYPE mcparticle, float* p)  ;
-float lcmcpgetmass( PTRTYPE mcparticle )  ;
+int lcmcpgetmomentum( PTRTYPE mcparticle, double* p)  ;
+double lcmcpgetmass( PTRTYPE mcparticle )  ;
 float lcmcpgetcharge( PTRTYPE mcparticle )  ;
-float lcmcpgetenergy( PTRTYPE mcparticle )  ;
+double lcmcpgetenergy( PTRTYPE mcparticle )  ;
 
 int lcmcpaddparent(  PTRTYPE mcparticle, PTRTYPE parent ) ;
 // int lcmcpsetsecondparent(  PTRTYPE mcparticle, PTRTYPE parent ) ;
@@ -56,10 +56,10 @@
 FCALLSCFUN1(INT, lcmcpgetsimulatorstatus, LCMCPGETSIMULATORSTATUS, lcmcpgetsimulatorstatus, CFORTRANPNTR ) 
 FCALLSCFUN2(INT, lcmcpgetvertex,LCMCPGETVERTEX,lcmcpgetvertex, CFORTRANPNTR, DOUBLEV ) 
 FCALLSCFUN1(FLOAT, lcmcpgettime, LCMCPGETTIME, lcmcpgettime, CFORTRANPNTR ) 
-FCALLSCFUN2(INT, lcmcpgetmomentum,LCMCPGETMOMENTUM,lcmcpgetmomentum, CFORTRANPNTR, FLOATV ) 
-FCALLSCFUN1(FLOAT, lcmcpgetmass, LCMCPGETMASS, lcmcpgetmass, CFORTRANPNTR ) 
+FCALLSCFUN2(INT, lcmcpgetmomentum,LCMCPGETMOMENTUM,lcmcpgetmomentum, CFORTRANPNTR, DOUBLEV )
+FCALLSCFUN1(DOUBLE, lcmcpgetmass, LCMCPGETMASS, lcmcpgetmass, CFORTRANPNTR )
 FCALLSCFUN1(FLOAT, lcmcpgetcharge,LCMCPGETCHARGE,lcmcpgetcharge, CFORTRANPNTR ) 
-FCALLSCFUN1(FLOAT, lcmcpgetenergy, LCMCPGETENERGY, lcmcpgetenergy, CFORTRANPNTR ) 
+FCALLSCFUN1(DOUBLE, lcmcpgetenergy, LCMCPGETENERGY, lcmcpgetenergy, CFORTRANPNTR )
 
 FCALLSCFUN2(INT, lcmcpaddparent,LCMCPADDPARENT,lcmcpaddparent, CFORTRANPNTR, CFORTRANPNTR ) 
 // FCALLSCFUN2(INT, lcmcpsetsecondparent,LCMCPSETSECONDPARENT,lcmcpsetsecondparent, CFORTRANPNTR, CFORTRANPNTR ) 

lcio/src/cpp/src/CPPFORT
lcmcp.cc 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- lcmcp.cc	10 Mar 2005 11:54:54 -0000	1.6
+++ lcmcp.cc	22 Mar 2006 16:42:38 -0000	1.7
@@ -70,12 +70,12 @@
   MCParticleImpl* mcp = f2c_pointer<MCParticleImpl,LCObject>( mcparticle ) ;
   return mcp->getTime() ;  
 }
-int lcmcpgetmomentum( PTRTYPE mcparticle, float* p)  {
+int lcmcpgetmomentum( PTRTYPE mcparticle, double* p)  {
   MCParticleImpl* mcp = f2c_pointer<MCParticleImpl,LCObject>( mcparticle ) ;
   for( int i=0 ; i<3 ;  *p++ =  mcp->getMomentum()[i++]  ) ;
   return LCIO::SUCCESS ;
 }
-float lcmcpgetmass( PTRTYPE mcparticle )  {
+double lcmcpgetmass( PTRTYPE mcparticle )  {
   MCParticleImpl* mcp = f2c_pointer<MCParticleImpl,LCObject>( mcparticle ) ;
   return mcp->getMass() ;  
 }
@@ -83,7 +83,7 @@
   MCParticleImpl* mcp = f2c_pointer<MCParticleImpl,LCObject>( mcparticle ) ;
   return mcp->getCharge() ;  
 }
-float lcmcpgetenergy( PTRTYPE mcparticle )  {
+double lcmcpgetenergy( PTRTYPE mcparticle )  {
   MCParticleImpl* mcp = f2c_pointer<MCParticleImpl,LCObject>( mcparticle ) ;
   return mcp->getEnergy() ;  
 }

lcio/src/f77
lciof77api.inc 1.34 -> 1.35
diff -u -r1.34 -r1.35
--- lciof77api.inc	21 Oct 2005 13:53:20 -0000	1.34
+++ lciof77api.inc	22 Mar 2006 16:42:38 -0000	1.35
@@ -12,7 +12,7 @@
 *  H. Vogt
 *  05/06/2004  (reconstruction part added)
 *
-*  $Id: lciof77api.inc,v 1.34 2005/10/21 13:53:20 gaede Exp $
+*  $Id: lciof77api.inc,v 1.35 2006/03/22 16:42:38 hvogt Exp $
 ***************************************************
 
 #include "lciof77pointer.inc"
@@ -116,7 +116,8 @@
       integer lcmcpgetpdg, lcmcpgetgeneratorstatus
       integer lcmcpgetsimulatorstatus
       integer lcmcpgetvertex, lcmcpgetmomentum
-      real    lcmcpgetmass, lcmcpgettime, lcmcpgetcharge, lcmcpgetenergy
+      real    lcmcpgettime, lcmcpgetcharge
+      double precision lcmcpgetmass, lcmcpgetenergy
       integer lcmcpaddparent, lcmcpadddaughter 
       integer lcmcpsetpdg, lcmcpsetgeneratorstatus
       integer lcmcpsetsimulatorstatus, lcmcpsetvertex 

lcio/src/latex/manual
f77summary.tex 1.17 -> 1.18
diff -u -r1.17 -r1.18
--- f77summary.tex	19 Sep 2005 15:40:29 -0000	1.17
+++ f77summary.tex	22 Mar 2006 16:42:38 -0000	1.18
@@ -411,9 +411,9 @@
 getSimulatorStatus     -> istats  = lcmcpgetsimulatorstatus( pmcp )
 getVertex              -> status  = lcmcpgetvertex( pmcp , dvtxv )
 getEndpoint            -> status  = lcmcpgetendpoint( pmcp , dvtxv )
-getMomentum            -> status  = lcmcpgetmomentum( pmcp , momv )
-getEnergy              -> energy  = lcmcpgetenergy( pmcp )
-getMass                -> mass    = lcmcpgetmass( pmcp )
+getMomentum            -> status  = lcmcpgetmomentum( pmcp , dmomv )
+getEnergy              -> denergy = lcmcpgetenergy( pmcp )
+getMass                -> dmass   = lcmcpgetmass( pmcp )
 getCharge              -> charge  = lcmcpgetcharge( pmcp )
 
 
CVSspam 0.2.8