Changeset 239 in Idarraga

Timestamp:

Oct 7, 2011, 5:39:04 PM (13 years ago)

Author:

idarraga

Message:

 

Location:

mafalda

Files:

• MAFTools/MAFTools.cpp (modified) (1 diff)
• MAFTools/MAFTools.h (modified) (1 diff)
• ShallowAngleFEIX/ShallowAngleFEIX.cpp (modified) (3 diffs)
• ShallowAngleFEIX/ShallowAngleFEIX.h (modified) (1 diff)

mafalda/MAFTools/MAFTools.cpp

@@ -222 +222 @@
 }
 
-void FindDiscontinuity(blob b){
+int FindDiscontinuity(blob b){
 
         // get the content set x,y
         set< pair<Int_t, Int_t> > cs = b.GetContentSet();
         set< pair<Int_t, Int_t> >::iterator csItr = cs.begin();
-
-/*
-        for( ; csItr != cs.end() ; csItr++){
-                std::cout << (*csItr).first << ", " << (*csItr).second << " : "
-                                <<
-        }
-*/
-
+        set< pair<Int_t, Int_t> >::iterator csItr2 = cs.begin();
+
+        double dist = 0.;
+        int nClose = 0;
+        for( ; csItr != cs.end() ; csItr++) {
+
+                nClose = 0;
+                for(csItr2 = cs.begin() ; csItr2 != cs.end() ; csItr2++) {
+
+                        if(csItr != csItr2) {
+                                dist = CalcDistance(*csItr, *csItr2);
+                        }
+
+                        if(dist < 1.5) nClose++;
+
+                }
+                if (nClose == 1) return 1; // discontinuity
+                //std::cout << endl;
+                //std::cout << "nClose = " << nClose << " ---------" << std::endl;
+
+        }
+
+        return 0;
 }
 

mafalda/MAFTools/MAFTools.h

@@ -60 +60 @@
   void DumpBlobContents(blob);
 
-
+  int FindDiscontinuity(blob);
 }
 

mafalda/ShallowAngleFEIX/ShallowAngleFEIX.cpp

@@ -40 +40 @@
         getMyTree()->Branch("chargeWeights", &m_chargeWeights);
 
+        getMyTree()->Branch("segmentedTrack", &m_segmentedTrack, "segmentedTrack/I");
         getMyTree()->Branch("clusterSize", &m_clusterSize, "clusterSize/I");
         getMyTree()->Branch("clusterHeight", &m_clusterHeight, "clusterHeight/I");
@@ -144 +145 @@
                         m_mipThetaAngle = (*blobsItr).GetBlobProperties().rotAngle;
 
+                        // check discontinuitis if any
+                        if ( MAFTools::FindDiscontinuity(*blobsItr) == 1 ) {
+                                m_segmentedTrack = 1;
+                        } else {
+                                m_segmentedTrack = 0;
+                        }
+
                         // Find the limit pixels to add-up the charge per column.
                         //  It turns out that the limit pixels found above are not exactly
@@ -173 +181 @@
 
                         int cntr = 0;
+
+                        for(int xi = 0 ; xi <= 30 ; xi++){
+                                m_totPerSegment.push_back(0.); // add segment initialized at 0
+                                m_chargeWeights.push_back(0.); // add segment
+                        }
+
                         for(int x = initx ; x <= endx ; x++){
 

mafalda/ShallowAngleFEIX/ShallowAngleFEIX.h

@@ -51 +51 @@
   Int_t m_clusterHeight;
   Double_t m_mipThetaAngle;
+  Int_t m_segmentedTrack;
 
   vector<Int_t> m_totPerSegment; // Total TOT per segment/pixel