diff -u -r1.29 -r1.30
--- SimCalorimeterHitProcessor.cpp	17 Oct 2011 15:47:50 -0000	1.29
+++ SimCalorimeterHitProcessor.cpp	18 Jan 2012 21:36:34 -0000	1.30
@@ -57,7 +57,7 @@

     LCCollectionVec* scRel = new LCCollectionVec(EVENT::LCIO::LCRELATION);
     scRel->parameters().setValue("RelationFromType", EVENT::LCIO::CALORIMETERHIT);
     scRel->parameters().setValue("RelationToType", EVENT::LCIO::SIMCALORIMETERHIT);

-

+    

     typedef std::map<MCParticle *, float> MCParticleToEnergyWeightMap;
     MCParticleToEnergyWeightMap mcParticleToEnergyWeightMap;
 

@@ -73,13 +73,10 @@

         // Get the CaloType string.
         const std::string& caloType = LcioInputCollectionSettings::getStringFromType(it->first);
 

-        // DEBUG
-        //std::cout << "SimCalHitProc - " << caloType << std::endl;
-

         // Skip over unknown types of cal collections.
         if (caloType.compare("UNKNOWN") == 0)
         {

-            std::cout << "Skipping unknown type of calorimeter collections!" << std::endl;

+            std::cout << "Skipping unknown type of calorimeter collection!" << std::endl;

             continue;
         }
 

@@ -121,9 +118,6 @@

             // Get the collection name.
             const std::string& collectionName = (*it2);
 

-            // DEBUG
-            //std::cout << "collectionName - " << collectionName << std::endl;
-

             // Lookup CalHit collection in input event.
             LCCollection* simCalHits = 0;
             try

@@ -137,35 +131,32 @@

             }
             catch (std::exception& e)
             {

-                std::cout << "Caught unknown exception trying to access " << collectionName << " from event." << std::endl;

+                std::cout << "Caught unknown std exception trying to access " << collectionName << " from event." << std::endl;

                 throw new std::exception;
             }
 

-            // Convert input SimCalorimeterHits into CalorimeterHits.

+            // Get the number of SimCalorimeterHits.

             int nSimHits = simCalHits->getNumberOfElements();
 

-            // DEBUG
-            //std::cout << "going to proc " << nSimHits << " SimCalHits from input coll" << std::endl;
-
-            // Loop over input SimCalHits.

+            // Loop over input SimCalorimeterHits and convert them to CalorimeterHits.

             for (int i = 0; i < nSimHits; i++)
             {

-                // Get the SimCalorimeterHit to be converted.

+                // Get the SimCalorimeterHit to be converted from the LCIO collection.

                 SimCalorimeterHit* simCalHit = dynamic_cast<SimCalorimeterHit*> (simCalHits->getElementAt(i));
 

-                // Get first time contrib.

+                // Get the first time contrib.

                 float timeCont = simCalHit->getTimeCont(0);
 

-                // Get energy.

+                // Get the raw energy deposition.

                 float rawEnergy = simCalHit->getEnergy();
 

-                // Time cut on late times.

+                // Apply the time cut from the subdetector params.

                 if (timeCont > timeCut)
                 {
                     continue;
                 }
 

-                // Cut on input hits with energy less than mipCut.

+                // Apply MIP energy cut from the subdetector params.

                 if (rawEnergy < mipCut)
                 {
                     continue;

@@ -174,38 +165,51 @@

                 // Create a new CalorimeterHit.
                 CalorimeterHitImpl* calHit = new CalorimeterHitImpl;
 

-                // Get the two 32-bit chunks of the id.

+                // Get the two 32-bit chunks of the ID.

                 int cellId0 = simCalHit->getCellID0();
                 int cellId1 = simCalHit->getCellID1();
 

-                // Make a 64-bit id for the IDDecoder.
-                // The type MUST be "long long" and not "long".  (from tonyj)
-                long long cellId = ((long long)cellId1)<<32 | cellId0;

+                // Make a 64-bit id for the IDDecoder.  The type MUST be "long long" and not "long".  (from Tony Johnson)
+                long long cellId = ((long long)cellId1) << 32 | cellId0;

-                // Decode the layer number from the id.

+                // Decode the layer number from the ID.

                 int layer = decoder->getFieldValue("layer", cellId);
 

-                // Get the layer parameters for this layer.

+                // Get the parameters for this layer.

                 PandoraApi::GeometryParameters::LayerParameters layerParams = (*layerList)[layer];
 

-                // Get the extra layer parameters for this layer (sampling).

+                // Get the extra parameters for this layer.

                 float samplingFrac = 0.f;
                 try
                 {

+                    // Get the layer parameters.

                     DetectorGeometry::ExtraLayerParameters xlayerParams = xsubdet->m_extraLayerParams.at(layer);

+

                     // Get the sampling fraction for this layer.

-                    // TODO: Separate EM + HAD sampling fractions.

                     samplingFrac = xlayerParams.m_samplingFraction.Get();