Changeset 249 in Idarraga

Timestamp:

Nov 1, 2011, 11:38:14 PM (13 years ago)

Author:

idarraga

Message:

 

Location:

mafalda/ShallowAngleFEIX

Files:

• ShallowAngleFEIX.cpp (modified) (5 diffs)
• ShallowAngleFEIX.h (modified) (1 diff)

mafalda/ShallowAngleFEIX/ShallowAngleFEIX.cpp

@@ -39 +39 @@
         getMyTree()->Branch("totPerSegment", &m_totPerSegment);
         getMyTree()->Branch("chargeWeights", &m_chargeWeights);
+        getMyTree()->Branch("frameId", &m_frameId , "frameId/I");
 
         getMyTree()->Branch("segmentedTrack", &m_segmentedTrack, "segmentedTrack/I");
@@ -78 +79 @@
         for( ; blobsItr != blobsVector.end() ; blobsItr++)
         {
+
+                // frame Id
+                m_frameId = GetFrameId();
 
                 // Limit all this to clusters with a minimum size.
@@ -147 +151 @@
                         m_mipThetaAngle = (*blobsItr).GetBlobProperties().rotAngle;
 
-                        // check discontinuities if any
+                        // Check discontinuities if any
                         // For this I will run the clustering again with discontinuity tolerance = 0;
                         int nInnerClusters = CheckDiscontinuity(*blobsItr, 0);
@@ -355 +359 @@
 int ShallowAngleFEIX::CheckDiscontinuity(blob bl, int discontinuityTolerance){
 
-        // new object containing all the blobs, ready to go to StoreGate when's ready
+        // New object containing all the blobs
         AllBlobsContainer * reclusteringContainer = new AllBlobsContainer((MediPixAlgo *) this);
         Log << MSG::INFO << "Reclustering container --> " << reclusteringContainer << endreq;
@@ -364 +368 @@
         Log << MSG::INFO << "Reclustering ... found " << reclusteringContainer->GetBlobsVector().size() << " clusters in the blob" << endreq;
 
-        return reclusteringContainer->GetBlobsVector().size();
+        int nSubClusters = reclusteringContainer->GetBlobsVector().size();
+        delete reclusteringContainer;
+
+        return nSubClusters;
 }
 

mafalda/ShallowAngleFEIX/ShallowAngleFEIX.h

@@ -54 +54 @@
         Double_t m_mipThetaAngle;
         Int_t m_segmentedTrack;
+        Int_t m_frameId;
 
         // Container for reclustering if needed