Changeset 238 in Idarraga

Timestamp:

Oct 7, 2011, 12:09:49 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) (4 diffs)
• ShallowAngleFEIX/ShallowAngleFEIX.h (modified) (1 diff)
• ShallowAngleFEIX/configuration_algos_ShallowAngleFEIX.txt (modified) (1 diff)
• ShallowAngleFEIX/runAngle.C (modified) (1 diff)
• ShallowAngleFEIX/runNewAlgo.C (modified) (8 diffs)

mafalda/MAFTools/MAFTools.cpp

@@ -222 +222 @@
 }
 
+void 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 << " : "
+                                <<
+        }
+*/
+
+}
+
 }
 

mafalda/MAFTools/MAFTools.h

@@ -56 +56 @@
   Bool_t BlobAtADistanceFromEdges(blob, vector<pair<Float_t, Float_t> >, Int_t, Int_t, Int_t, Int_t);
 
+
+  /* Dump contents of a blobl */
+  void DumpBlobContents(blob);
+
+
 }
 

mafalda/ShallowAngleFEIX/ShallowAngleFEIX.cpp

@@ -33 +33 @@
         //  Algorithm.  The branches registered through getMyTree() get registered
         //  in that tree so you can fill them each time Execute() gets called.
+
         getMyTree()->Branch("distanceToCenter", &m_distanceToCenter);
-        getMyTree()->Branch("clusterSize", &m_clusterSize, "clusterSize/I");
         getMyTree()->Branch("mipLength", &m_mipLength);
         getMyTree()->Branch("mipLength_X", &m_mipLength_X);
         getMyTree()->Branch("totPerSegment", &m_totPerSegment);
         getMyTree()->Branch("chargeWeights", &m_chargeWeights);
+
+        getMyTree()->Branch("clusterSize", &m_clusterSize, "clusterSize/I");
         getMyTree()->Branch("clusterHeight", &m_clusterHeight, "clusterHeight/I");
+        getMyTree()->Branch("mipThetaAngle", &m_mipThetaAngle, "mipThetaAngle/D");
+
 
         // A configuration value that can be tuned from the Viewer
@@ -134 +138 @@
 
                         Log << MSG::INFO << "Mip angle = " <<  (*blobsItr).GetBlobProperties().rotAngle << endreq;
-                        if( TMath::Abs( (*blobsItr).GetBlobProperties().rotAngle ) > TMath::Pi()/3.)
+                        if( TMath::Abs( (*blobsItr).GetBlobProperties().rotAngle ) > TMath::Pi()/6.)
                                 continue;
+
+                        // store the angle in rads
+                        m_mipThetaAngle = (*blobsItr).GetBlobProperties().rotAngle;
 
                         // Find the limit pixels to add-up the charge per column.
@@ -153 +160 @@
                         Log << MSG::INFO << "                            y:" << inity << " , " << endy << endreq;
 
+                        // some infor about this blob after clustering
+                        // get the content set x,y
+                        set< pair<Int_t, Int_t> > cs = (*blobsItr).GetContentSet();
+                        set< pair<Int_t, Int_t> >::iterator csItr = cs.begin();
+                        Log << MSG::INFO << "Components (x,y : counts) " << endreq;
+                        for( ; csItr != cs.end() ; csItr++) {
+                                Log << MSG::INFO << "    " << (*csItr).first << ", " << (*csItr).second << " : "
+                                                << GetMatrixElement(*csItr) << endreq;
+                        }
+
                         m_clusterHeight = (*blobsItr).GetBlobProperties().width_y;
 
@@ -204 +221 @@
                         GuessNumberOfDeltaRaysFromUnbalance(nDeltaR, nDeltaSoft);
 
+                        // there might be more than 1 good mip in a frame
+                        // Fill and clean up here
+
+                        // Fill the output tree of this algorithm
+                        getMyTree()->Fill();
+
+                        // WARNING ! don't forget to clean up your variables for the next TTree::Fill call
+                        m_distanceToCenter.clear();
+                        m_totPerSegment.clear();
+                        m_chargeWeights.clear();
+                        m_mipLength.clear();
+                        m_mipLength_X.clear();
+                        m_mipThetaAngle = 0.;
 
                 }
 
-                // there might be more than 1 good mip in a frame
-                // Fill and clean up here
-
-                // Fill the output tree of this algorithm
-                getMyTree()->Fill();
-
-                // WARNING ! don't forget to clean up your variables for the next TTree::Fill call
-                m_distanceToCenter.clear();
-                m_totPerSegment.clear();
-                m_chargeWeights.clear();
-                m_mipLength.clear();
-                m_mipLength_X.clear();
 
         }

mafalda/ShallowAngleFEIX/ShallowAngleFEIX.h

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

mafalda/ShallowAngleFEIX/configuration_algos_ShallowAngleFEIX.txt

@@ -11 +11 @@
 PRBasicSpecies nInnerPixels 2 int
 PRBasicSpecies longGammaMax 3 int
-PRBasicSpecies minNPixelsMip 6 int
+PRBasicSpecies minNPixelsMip 5 int
 PRBasicSpecies maxNPixelsCurly 50 int
 ShallowAngleFEIX minNPixels 5 int

mafalda/ShallowAngleFEIX/runAngle.C

@@ -20 +20 @@
 
 
-  GetTree("/storage1/idarraga/Testbeam_September_CERN_2011/KEK_20V_200V_4deg/MAFOutput/MAFOutput_MPXNtuple_USBPIXI4_20.root",
-          "ShallowAngleFEIX", "DUT0", 1.0);
+  GetTree("/home/idarraga/storage/61548/slice1/MAFOutput_MPXNtuple_USBPIXI4_22.root",
+          "ShallowAngleFEIX", "Lub4", 1.0);
 
-  GetTree("/storage1/idarraga/Testbeam_September_CERN_2011/KEK_20V_200V_4deg/MAFOutput/MAFOutput_MPXNtuple_USBPIXI4_21.root",
-          "ShallowAngleFEIX", "DUT2", 1.0);
+  //GetTree("/storage1/idarraga/Testbeam_September_CERN_2011/KEK_20V_200V_4deg/MAFOutput/MAFOutput_MPXNtuple_USBPIXI4_21.root",
+//  "ShallowAngleFEIX", "DUT2", 1.0);
 
-  GetTree("/storage1/idarraga/Testbeam_September_CERN_2011/KEK_20V_200V_4deg/MAFOutput/MAFOutput_MPXNtuple_USBPIXI4_22.root",
-          "ShallowAngleFEIX", "DUT3", 1.0);
+  //GetTree("/storage1/idarraga/Testbeam_September_CERN_2011/KEK_20V_200V_4deg/MAFOutput/MAFOutput_MPXNtuple_USBPIXI4_22.root",
+  //      "ShallowAngleFEIX", "DUT3", 1.0);
 
   /*

mafalda/ShallowAngleFEIX/runNewAlgo.C

@@ -5 +5 @@
 //#define __NDIV          8
 //#define __THICKNESS 0.320 // [mm]  KEK FE-I3
-#define __THICKNESS 0.150 // [mm]    KEK FE-I4 run 50734 to 50744
+//#define __THICKNESS 0.150 // [mm]    KEK FE-I4 run 50734 to 50744
+#define __THICKNESS 0.250 // [mm]    Lub4 run 61548
 
 #define __CHARGE  10
@@ -16 +17 @@
         TChain * T1 = new TChain("ShallowAngleFEIX");
 
-        T1->Add("/home/idarraga/analysis/mafalda/MAFOutput_MPXNtuple_AllPix_det_200_shallowAngle_Planar.root");
+        T1->Add("/home/idarraga/analysis/mafalda/MAFOutput_MPXNtuple_USBPIXI4_23.root");
+        TString titleT = "3D SCC87";
+
+        //T1->Add("/home/idarraga/storage/61548/slice1/MAFOutput_MPXNtuple_USBPIXI4_22.root");
+        //TString titleT = "Lub4 n-5e15, eta2.5";
+
         //T1->Add("/storage1/idarraga/Testbeam_July_CERN_2011/KEK_100V_4deg/MAFOutput/MAFOutput_MPXNtuple_USBPIXI4_21_100V.root");
-        TString titleT = "KEK FE-I4 ~4deg Planar";
         //T1->Add("/home/idarraga/analysis/mafalda/MAFOutput_MPXNtuple_USBPIX_10_dep.root");
         //T->Add("/home/idarraga/analysis/mafalda/MAFOutput_KEK_run050620.root");
@@ -25 +30 @@
 
         Int_t plotType = __CHARGE;
-        Int_t ndiv = 10;
-        Int_t fulldiv = 10;
+        Int_t ndiv = 7;
+        Int_t fulldiv = 7;
         Int_t rangeYMax = 14;
 
@@ -50 +55 @@
         lt2->DrawLatex(0.06, 1, "MAFalda, idarraga@cern.ch");
 
+        return;
+
         /////////////////////////////////////////////////////////////////////////////////////
 
@@ -104 +111 @@
 
         int partitionCntr = 0;
-        for (indx = __NDIV-1 ; indx >= 0 ; indx--) {
+        for (int indx = __NDIV-1 ; indx >= 0 ; indx--) {
         //for (indx = 0 ; indx < __NDIV ; indx++) {
 
@@ -122 +129 @@
                 cout << "word --> " << wordDraw << endl;
                 c1->cd(indx+1);
-                TString cutS = "clusterHeight < 3 && ";
-                cutS += "clusterSize == ";
+                TString cutS = "clusterHeight < 3 ";
+                cutS += " && clusterSize == ";
                 cutS += __NDIV;
+                cutS += " && mipThetaAngle < 0.17"; // ~10 deg
                 TCut cutC = cutS;
                 T->Draw(wordDraw, cutC);
@@ -173 +181 @@
 
 
+        /*
         if ( __NDIV == 6 ) {
                 Qp.push_back(0.);
@@ -179 +188 @@
                 errDepth.push_back(partition/2.);
         }
+        */
 
         TCanvas * c2 = new TCanvas();