Print

Print


Commit in slic/src on MAIN
LcioManager.cc+9-31.81 -> 1.82
JM: add writing of idrup from StdHep v4 files to output Lcio file

slic/src
LcioManager.cc 1.81 -> 1.82
diff -u -r1.81 -r1.82
--- LcioManager.cc	29 Aug 2008 00:42:49 -0000	1.81
+++ LcioManager.cc	2 Sep 2008 23:38:23 -0000	1.82
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.81 2008/08/29 00:42:49 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.82 2008/09/02 23:38:23 jeremy Exp $
 #include "LcioManager.hh"
 
 // slic
@@ -367,15 +367,21 @@
     lcevt->setRunNumber(m_runHdr->getRunNumber() );
     lcevt->setDetectorName(m_runHdr->getDetectorName() );
 
-    // Set the event weight from the StdHep file.
+    // Set the event weight and idrup from the StdHep file.
     EventSourceManager* genMgr = EventSourceManager::instance();
     if (genMgr->getCurrentSourceType() == EventSourceManager::eStdHep) 
     {        
-        lcevt->parameters().setValue("_weight",(float)((StdHepEventSource*)(genMgr->getCurrentSource()))->getStdHepReader()->eventweight());
+        lStdHep* stdhep = ((StdHepEventSource*)(genMgr->getCurrentSource()))->getStdHepReader();
+        if (stdhep->isStdHepEv4()) 
+        {
+            lcevt->parameters().setValue("_weight",(float)stdhep->eventweight());
+            lcevt->parameters().setValue("idrup",(int)stdhep->idrup());
+        }
     }
     else 
     {
         lcevt->parameters().setValue("_weight",(float)1.0);
+        lcevt->parameters().setValue("idrup",(float)0.0);
     }
 
     setCurrentLCEvent( lcevt );
CVSspam 0.2.8