Print

Print


Commit in slicPandora/src on MAIN
MCParticleProcessor.cpp+6-61.2 -> 1.3
set MCParticle type to fix runtime error

slicPandora/src
MCParticleProcessor.cpp 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- MCParticleProcessor.cpp	24 Nov 2010 16:44:08 -0000	1.2
+++ MCParticleProcessor.cpp	15 Jan 2013 22:55:58 -0000	1.3
@@ -1,4 +1,4 @@
-// $Id: MCParticleProcessor.cpp,v 1.2 2010/11/24 16:44:08 speckmay Exp $
+// $Id: MCParticleProcessor.cpp,v 1.3 2013/01/15 22:55:58 jeremy Exp $
 
 #include "MCParticleProcessor.h"
 
@@ -42,13 +42,13 @@
     for (int i=0; i<nptcl; i++)
     {
         MCParticle* mcParticle = dynamic_cast<MCParticle*> (mcParticles->getElementAt(i));
-        PandoraApi::MCParticle::Parameters mcParticleParams = makeMCParticleParameters( mcParticle);
+        PandoraApi::MCParticle::Parameters mcParticleParams = makeMCParticleParameters(mcParticle);
 
 #ifdef MCPARTICLE_PARAMS_DEBUG
         printCaloHitParameters(mcParticleParams);
 #endif
                       
-        PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::MCParticle::Create(pandora, mcParticleParams));
+        //PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::MCParticle::Create(pandora, mcParticleParams));
     }
 #ifdef MCPARTICLE_PARAMS_DEBUG
     std::cout << "-----------------------------------------------------" << std::endl;
@@ -56,11 +56,12 @@
 }
 
 
-PandoraApi::MCParticle::Parameters MCParticleProcessor::makeMCParticleParameters( MCParticle* pMcParticle )
+PandoraApi::MCParticle::Parameters MCParticleProcessor::makeMCParticleParameters(MCParticle* pMcParticle)
 {
     const pandora::Pandora& pandora = getJobManager()->getPandora();
 
     PandoraApi::MCParticle::Parameters mcParticleParameters;
+    mcParticleParameters.m_mcParticleType = pandora::MC_STANDARD;
     mcParticleParameters.m_energy = pMcParticle->getEnergy();
     mcParticleParameters.m_particleId = pMcParticle->getPDG();
     mcParticleParameters.m_pParentAddress = pMcParticle;
@@ -77,8 +78,7 @@
     for(std::vector<MCParticle*>::const_iterator itDaughter = pMcParticle->getDaughters().begin(),
             itDaughterEnd = pMcParticle->getDaughters().end(); itDaughter != itDaughterEnd; ++itDaughter)
     {
-        PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::SetMCParentDaughterRelationship(pandora, pMcParticle,
-                                                                                                     *itDaughter));
+        PANDORA_THROW_RESULT_IF(pandora::STATUS_CODE_SUCCESS, !=, PandoraApi::SetMCParentDaughterRelationship(pandora, pMcParticle, *itDaughter));
     }
 
     return mcParticleParameters;                                               
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1