Updates Ntuple definition

analysis/TrackingNtuple.h

@@ -282,6 +282,8 @@ public :
    vector<vector<int> > *scl_charge;
    vector<vector<int> > *scl_lay1;
    vector<vector<int> > *scl_lay2;
+   vector<vector<int> > *scl_ladder_blade1;
+   vector<vector<int> > *scl_ladder_blade2;
    vector<vector<int> > *scl_subDet1;
    vector<vector<int> > *scl_subDet2;
    vector<vector<float> > *scl_dRz1;
@@ -289,7 +291,8 @@ public :
    vector<vector<float> > *scl_dRz2;
    vector<vector<float> > *scl_dPhi2;
    vector<vector<int> > *scl_seedType;
-   vector<vector<unsigned char> > *scl_hitsMask;
+   vector<vector<int> > *scl_seedHitIdx1;
+   vector<vector<int> > *scl_seedHitIdx2;
 
    // List of branches
    TBranch        *b_event;   //!
@@ -551,6 +554,8 @@ public :
    TBranch        *b_scl_charge;   //!
    TBranch        *b_scl_lay1;   //!
    TBranch        *b_scl_lay2;   //!
+   TBranch        *b_scl_ladder_blade1;   //!
+   TBranch        *b_scl_ladder_blade2;   //!
    TBranch        *b_scl_subDet1;   //!
    TBranch        *b_scl_subDet2;   //!
    TBranch        *b_scl_dRz1;   //!
@@ -558,7 +563,8 @@ public :
    TBranch        *b_scl_dRz2;   //!
    TBranch        *b_scl_dPhi2;   //!
    TBranch        *b_scl_seedType;   //!
-   TBranch        *b_scl_hitsMask;   //!
+   TBranch        *b_scl_seedHitIdx1;   //!
+   TBranch        *b_scl_seedHitIdx2;   //!
 
    TrackingNtuple(TTree *tree=0);
    virtual ~TrackingNtuple();
@@ -570,7 +576,7 @@ public :
    virtual void     Show(Long64_t entry = -1);
 };
 
-TrackingNtuple::TrackingNtuple(TTree *tree) : fChain(0) 
+TrackingNtuple::TrackingNtuple(TTree *tree) : fChain(0)
 {
 // if parameter tree is not specified (or zero), connect the file
 // used to generate this class and read the Tree.
@@ -871,7 +877,8 @@ void TrackingNtuple::Init(TTree *tree)
    scl_z = 0;
    scl_charge = 0;
    scl_lay1 = 0;
-   scl_lay2 = 0;
+   scl_ladder_blade1 = 0;
+   scl_ladder_blade2 = 0;
    scl_subDet1 = 0;
    scl_subDet2 = 0;
    scl_dRz1 = 0;
@@ -879,7 +886,8 @@ void TrackingNtuple::Init(TTree *tree)
    scl_dRz2 = 0;
    scl_dPhi2 = 0;
    scl_seedType = 0;
-   scl_hitsMask = 0;
+   scl_seedHitIdx1 = 0;
+   scl_seedHitIdx2 = 0;
    // Set branch addresses and branch pointers
    if (!tree) return;
    fChain = tree;
@@ -1145,6 +1153,8 @@ void TrackingNtuple::Init(TTree *tree)
    fChain->SetBranchAddress("scl_charge", &scl_charge, &b_scl_charge);
    fChain->SetBranchAddress("scl_lay1", &scl_lay1, &b_scl_lay1);
    fChain->SetBranchAddress("scl_lay2", &scl_lay2, &b_scl_lay2);
+   fChain->SetBranchAddress("scl_ladder_blade1", &scl_ladder_blade1, &b_scl_ladder_blade1);
+   fChain->SetBranchAddress("scl_ladder_blade2", &scl_ladder_blade2, &b_scl_ladder_blade2);
    fChain->SetBranchAddress("scl_subDet1", &scl_subDet1, &b_scl_subDet1);
    fChain->SetBranchAddress("scl_subDet2", &scl_subDet2, &b_scl_subDet2);
    fChain->SetBranchAddress("scl_dRz1", &scl_dRz1, &b_scl_dRz1);
@@ -1152,7 +1162,8 @@ void TrackingNtuple::Init(TTree *tree)
    fChain->SetBranchAddress("scl_dRz2", &scl_dRz2, &b_scl_dRz2);
    fChain->SetBranchAddress("scl_dPhi2", &scl_dPhi2, &b_scl_dPhi2);
    fChain->SetBranchAddress("scl_seedType", &scl_seedType, &b_scl_seedType);
-   fChain->SetBranchAddress("scl_hitsMask", &scl_hitsMask, &b_scl_hitsMask);
+   fChain->SetBranchAddress("scl_seedHitIdx1", &scl_seedHitIdx1, &b_scl_seedHitIdx1);
+   fChain->SetBranchAddress("scl_seedHitIdx2", &scl_seedHitIdx2, &b_scl_seedHitIdx2);
    Notify();
 }
 

analysis/obj_types.cpp

@@ -948,6 +948,8 @@ struct SuperCluster {
     vector<int>           charge;
     vector<int>           lay1;
     vector<int>           lay2;
+    vector<int>           ladder_blade1;
+    vector<int>           ladder_blade2;
     vector<int>           subDet1;
     vector<int>           subDet2;
     vector<float>         dRz1;
@@ -955,7 +957,8 @@ struct SuperCluster {
     vector<float>         dRz2;
     vector<float>         dPhi2;
     vector<int>           seedType;
-    vector<unsigned char> hitsMask;
+    vector<int>           seedHitIdx1;
+    vector<int>           seedHitIdx2;
 };
 
 Value<vector<SuperCluster>>*
@@ -971,6 +974,8 @@ register_super_clusters(TrackingDataSet &tds){
                                        vector<vector<int>>,           // charge;
                                        vector<vector<int>>,           // lay1;
                                        vector<vector<int>>,           // lay2;
+                                       vector<vector<int>>,           // ladder_blade1;
+                                       vector<vector<int>>,           // ladder_blade2;
                                        vector<vector<int>>,           // subDet1;
                                        vector<vector<int>>,           // subDet2;
                                        vector<vector<float>>,         // dRz1;
@@ -978,7 +983,8 @@ register_super_clusters(TrackingDataSet &tds){
                                        vector<vector<float>>,         // dRz2;
                                        vector<vector<float>>,         // dPhi2;
                                        vector<vector<int>>,           // seedType;
-                                       vector<vector<unsigned char>>  // hitsMask;
+                                       vector<vector<int>>,           // seedHitIdx1;
+                                       vector<vector<int>>            // seedHitIdx1;
                                         )>("build_super_clusters",
         FUNC(([](const vector<float>&                  e,
                  const vector<float>&                  px,
@@ -990,6 +996,8 @@ register_super_clusters(TrackingDataSet &tds){
                  const vector<vector<int>>&            charge,
                  const vector<vector<int>>&            lay1,
                  const vector<vector<int>>&            lay2,
+                 const vector<vector<int>>&            ladder_blade1,
+                 const vector<vector<int>>&            ladder_blade2,
                  const vector<vector<int>>&            subDet1,
                  const vector<vector<int>>&            subDet2,
                  const vector<vector<float>>&          dRz1,
@@ -997,7 +1005,8 @@ register_super_clusters(TrackingDataSet &tds){
                  const vector<vector<float>>&          dRz2,
                  const vector<vector<float>>&          dPhi2,
                  const vector<vector<int>>&            seedType,
-                 const vector<vector<unsigned char>>& hitsMask){
+                 const vector<vector<int>>&            seedHitIdx1,
+                 const vector<vector<int>>&            seedHitIdx2){
             std::vector<SuperCluster> super_clusters;
             for(unsigned int i=0; i<e.size(); i++)
                 super_clusters.push_back({i,
@@ -1011,6 +1020,8 @@ register_super_clusters(TrackingDataSet &tds){
                                           charge[i],
                                           lay1[i],
                                           lay2[i],
+                                          ladder_blade1[i],
+                                          ladder_blade2[i],
                                           subDet1[i],
                                           subDet2[i],
                                           dRz1[i],
@@ -1018,7 +1029,8 @@ register_super_clusters(TrackingDataSet &tds){
                                           dRz2[i],
                                           dPhi2[i],
                                           seedType[i],
-                                          hitsMask[i]});
+                                          seedHitIdx1[i],
+                                          seedHitIdx2[i]});
             return super_clusters;
         })));
 
@@ -1033,6 +1045,8 @@ register_super_clusters(TrackingDataSet &tds){
                   tds.track_branch_obj<vector<vector<int>>>("scl_charge"),
                   tds.track_branch_obj<vector<vector<int>>>("scl_lay1"),
                   tds.track_branch_obj<vector<vector<int>>>("scl_lay2"),
+                  tds.track_branch_obj<vector<vector<int>>>("scl_ladder_blade1"),
+                  tds.track_branch_obj<vector<vector<int>>>("scl_ladder_blade2"),
                   tds.track_branch_obj<vector<vector<int>>>("scl_subDet1"),
                   tds.track_branch_obj<vector<vector<int>>>("scl_subDet2"),
                   tds.track_branch_obj<vector<vector<float>>>("scl_dRz1"),
@@ -1040,8 +1054,9 @@ register_super_clusters(TrackingDataSet &tds){
                   tds.track_branch_obj<vector<vector<float>>>("scl_dRz2"),
                   tds.track_branch_obj<vector<vector<float>>>("scl_dPhi2"),
                   tds.track_branch_obj<vector<vector<int>>>("scl_seedType"),
-                  tds.track_branch_obj<vector<vector<unsigned char>>>("scl_hitsMask")),
-        "super_clusters");
+                  tds.track_branch_obj<vector<vector<int>>>("scl_seedHitIdx1"),
+                  tds.track_branch_obj<vector<vector<int>>>("scl_seedHitIdx2")
+                  ), "super_clusters");
 }