BBA: update of settings and cuts

reco/alignment/CbmBbaAlignmentTask.cxx

@@ -184,35 +184,66 @@ InitStatus CbmBbaAlignmentTask::Init()
     fHistoDir->mkdir(n1);
     fHistoDir->cd(n1);
 
-    double sizeX = 0.1;
-    double sizeY = 0.1;
+    int nBins = 1000;
 
+    double sizeX  = 0.1;
+    double sizeY  = 0.1;
+    double sizePX = 10.;
+    double sizePY = 10.;
     if (fTrackingMode == kSts) {
       sizeX = 0.1;
       sizeY = 0.1;
     }
     else if (fTrackingMode == kMcbm) {
-      sizeX = 1.5;
-      sizeY = 1.5;
+
+      if (i == -1) {
+        sizeX  = 20.;
+        sizeY  = 20.;
+        sizePX = 100.;
+        sizePY = 100.;
+      }
+
+      if (i == 0 || i == 1) {
+        sizeX = 0.1;
+        sizeY = 1.0;
+      }
+      if (i == 2) {
+        sizeX = 5.;
+        sizeY = 5.;
+      }
+      if (i == 3) {
+        sizeX  = 10.;
+        sizeY  = 20.;
+        sizePX = 100.;
+      }
+      if (i == 4) {
+        sizeX  = 20.;
+        sizeY  = 10.;
+        sizePY = 100.;
+      }
+      if (i >= 5) {
+        sizeX = 5.;
+        sizeY = 5.;
+      }
     }
 
     hResidualsBeforeAlignmentX.push_back(
-      new TH1F(Form("ResBeforeAli%s_X", n1), Form("X-Residuals Before Alignment%s", n2), 100, -sizeX, sizeX));
+      new TH1F(Form("ResBeforeAli%s_X", n1), Form("X-Residuals Before Alignment%s", n2), nBins, -sizeX, sizeX));
     hResidualsBeforeAlignmentY.push_back(
-      new TH1F(Form("ResBeforeAli%s_Y", n1), Form("Y-Residuals Before Alignment%s", n2), 100, -sizeY, sizeY));
+      new TH1F(Form("ResBeforeAli%s_Y", n1), Form("Y-Residuals Before Alignment%s", n2), nBins, -sizeY, sizeY));
     hResidualsAfterAlignmentX.push_back(
-      new TH1F(Form("ResAfterAli%s_X", n1), Form("X-Residuals After Alignment%s", n2), 100, -sizeX, sizeX));
+      new TH1F(Form("ResAfterAli%s_X", n1), Form("X-Residuals After Alignment%s", n2), nBins, -sizeX, sizeX));
     hResidualsAfterAlignmentY.push_back(
-      new TH1F(Form("ResAfterAli%s_Y", n1), Form("Y-Residuals After Alignment%s", n2), 100, -sizeY, sizeY));
+      new TH1F(Form("ResAfterAli%s_Y", n1), Form("Y-Residuals After Alignment%s", n2), nBins, -sizeY, sizeY));
 
     hPullsBeforeAlignmentX.push_back(
-      new TH1F(Form("PullBeforeAli%s_X", n1), Form("X-Pulls Before Alignment%s", n2), 100, -10., 10.));
+      new TH1F(Form("PullBeforeAli%s_X", n1), Form("X-Pulls Before Alignment%s", n2), nBins, -sizePX, sizePX));
     hPullsBeforeAlignmentY.push_back(
-      new TH1F(Form("PullBeforeAli%s_Y", n1), Form("Y-Pulls Before Alignment%s", n2), 100, -10., 10.));
+      new TH1F(Form("PullBeforeAli%s_Y", n1), Form("Y-Pulls Before Alignment%s", n2), nBins, -sizePY, sizePY));
     hPullsAfterAlignmentX.push_back(
-      new TH1F(Form("PullAfterAli%s_X", n1), Form("X-Pulls After Alignment%s", n2), 100, -10., 10.));
+      new TH1F(Form("PullAfterAli%s_X", n1), Form("X-Pulls After Alignment%s", n2), nBins, -sizePX, sizePX));
     hPullsAfterAlignmentY.push_back(
-      new TH1F(Form("PullAfterAli%s_Y", n1), Form("Y-Pulls After Alignment%s", n2), 100, -10., 10.));
+      new TH1F(Form("PullAfterAli%s_Y", n1), Form("Y-Pulls After Alignment%s", n2), nBins, -sizePY, sizePY));
   }
 
   gDirectory = curDirectory;
@@ -246,7 +277,7 @@ void CbmBbaAlignmentTask::Exec(Option_t* /*opt*/)
       TrackContainer t;
       if (!fFitter.CreateMvdStsTrack(t.fUnalignedTrack, iTr)) continue;
       t.MakeConsistent();
-      t.fUnalignedTrack.fMsQp0      = 1. / 0.1;
+      t.fUnalignedTrack.fMsQp0      = 0.;
       t.fUnalignedTrack.fIsMsQp0Set = false;
 
       for (auto& n : t.fUnalignedTrack.fNodes) {
@@ -283,19 +314,24 @@ void CbmBbaAlignmentTask::Exec(Option_t* /*opt*/)
         break;
       }
       t.MakeConsistent();
-      t.fUnalignedTrack.fMsQp0                                              = 1. / 0.5;
-      t.fUnalignedTrack.fIsMsQp0Set                                         = true;
-      t.fUnalignedTrack.fNodes[t.fUnalignedTrack.fFirstHitNode].fTrack.Qp() = 0.;
+      t.fUnalignedTrack.fMsQp0      = 1. / 0.5;
+      t.fUnalignedTrack.fIsMsQp0Set = true;
 
       for (auto& n : t.fUnalignedTrack.fNodes) {
         n.fIsTimeSet = false;
+        n.fTrack.SetQp(0.);
       }
 
-      fFitter.FitTrack(t.fUnalignedTrack);
-      t.fAlignedTrack = t.fUnalignedTrack;
       //if (t.fNstsHits < 1) continue;
       //if (t.fNtrdHits < 2) continue;
-      if (t.fNstsHits + t.fNtrdHits + t.fNtofHits < 4) continue;
+      if (t.fNstsHits + t.fNmuchHits + t.fNtrdHits + t.fNtofHits < fNtrackingStations - 1) continue;
+      //if (t.fNtrdHits < 3) continue;
+      if (t.fNstsHits < 2) continue;
+      if (t.fNtofHits < 2) continue;
+
+      fFitter.FitTrack(t.fUnalignedTrack);
+      t.fAlignedTrack = t.fUnalignedTrack;
+
       fTracks.push_back(t);
     }
   }