Changes from beam time

Update R3BScalersOnlineSpectra and R3BTofDOnlineSpectra Clang-format Minor change Clang-format Clang-format Clang-format
R3BRootGroup · Feb 24, 2024 · 5051165 · 5051165
1 parent f8b8463
commit 5051165
Show file tree

Hide file tree

Showing 15 changed files with 808 additions and 72 deletions.
diff --git a/analysis/AnaLinkDef.h b/analysis/AnaLinkDef.h
@@ -52,5 +52,6 @@
 #pragma link C++ class R3BIncomingIDOnlineSpectra+;
 #pragma link C++ class R3BTofDvsTttxOnlineSpectra+;
 #pragma link C++ class R3BOnlineSyncCheck+;
+#pragma link C++ class R3BScalersOnlineSpectra+;
 
 #endif
diff --git a/analysis/CMakeLists.txt b/analysis/CMakeLists.txt
@@ -78,6 +78,7 @@ ${R3BROOT_SOURCE_DIR}/r3bdata/footData
 ${R3BROOT_SOURCE_DIR}/r3bdata/rpcData
 ${R3BROOT_SOURCE_DIR}/r3bdata/wrData
 ${R3BROOT_SOURCE_DIR}/r3bdata/synccheckData
+${R3BROOT_SOURCE_DIR}/r3bdata/trloiiData
 ${R3BROOT_SOURCE_DIR}/tracker_rene
 ${R3BROOT_SOURCE_DIR}/analysis
 ${R3BROOT_SOURCE_DIR}/analysis/pars

diff --git a/analysis/online/R3BIncomingTrackingOnlineSpectra.cxx b/analysis/online/R3BIncomingTrackingOnlineSpectra.cxx
@@ -312,7 +312,7 @@ void R3BIncomingTrackingOnlineSpectra::Reset_Histo()
 
 void R3BIncomingTrackingOnlineSpectra::Exec(Option_t* /*option*/)
 {
-    double mwpc0x = -300., mwpc0y = -300., zrand = 0.;
+    double mwpc1x = -300., mwpc1y = -300., zrand = 0.;
     double xtarget = -500., ytarget = -500.;
 
     if (fCutIncoming && fFrsHitDataCA)
@@ -334,18 +334,18 @@ void R3BIncomingTrackingOnlineSpectra::Exec(Option_t* /*option*/)
     // Fill Mwpc0 Hit data
     // if (fMwpc0HitDataCA && fMwpc0HitDataCA->GetEntriesFast() > 0)
     {
-        Int_t nHits = fMwpc0HitDataCA->GetEntriesFast();
+        Int_t nHits = fMwpc1HitDataCA->GetEntriesFast();
         for (Int_t ihit = 0; ihit < nHits; ihit++)
         {
-            auto hit = dynamic_cast<R3BMwpcHitData*>(fMwpc0HitDataCA->At(ihit));
+            auto hit = dynamic_cast<R3BMwpcHitData*>(fMwpc1HitDataCA->At(ihit));
             if (!hit)
                 continue;
-            mwpc0x = hit->GetX() + fMw0GeoPar->GetPosX() * 10.; // mm
-            mwpc0y = hit->GetY() + fMw0GeoPar->GetPosY() * 10.; // mm
+            mwpc1x = hit->GetX() + fMw1GeoPar->GetPosX() * 10.; // mm
+            mwpc1y = hit->GetY() + fMw1GeoPar->GetPosY() * 10.; // mm
         }
 
         // Fill Mwpc1 Hit data
-        if (fMwpc1HitDataCA && fMwpc1HitDataCA->GetEntriesFast() > 0 && mwpc0y > -100. && fYearConf == 2022)
+        /*if (fMwpc1HitDataCA && fMwpc1HitDataCA->GetEntriesFast() > 0 && mwpc1y > -100. && fYearConf == 2022)
         {
             nHits = fMwpc1HitDataCA->GetEntriesFast();
             Float_t mwpc1x = -150.;
@@ -377,10 +377,10 @@ void R3BIncomingTrackingOnlineSpectra::Exec(Option_t* /*option*/)
                 fh2_angvsposx->Fill(xtarget, angX * 1000.);
                 fh2_angvsposy->Fill(ytarget, angY * 1000.);
             }
-        }
+        }*/
 
         // Fill Mwpc2 Hit data
-        if (fMwpc2HitDataCA && fMwpc2HitDataCA->GetEntriesFast() > 0 && mwpc0y > -100. && fYearConf == 2024)
+        if (fMwpc2HitDataCA && fMwpc2HitDataCA->GetEntriesFast() > 0 && mwpc1x > -100. && fYearConf == 2024)
         {
             nHits = fMwpc2HitDataCA->GetEntriesFast();
             Float_t mwpc2x = -150.;
@@ -394,8 +394,8 @@ void R3BIncomingTrackingOnlineSpectra::Exec(Option_t* /*option*/)
                     continue;
                 mwpc2x = hit->GetX() + fMw2GeoPar->GetPosX() * 10.;
                 mwpc2y = hit->GetY() + fMw2GeoPar->GetPosY() * 10.;
-                angX = std::atan((mwpc0x - mwpc2x) / (fMw0GeoPar->GetPosZ() - fMw2GeoPar->GetPosZ()) / 10.);
-                angY = std::atan((mwpc0y - mwpc2y) / (fMw0GeoPar->GetPosZ() - fMw2GeoPar->GetPosZ()) / 10.);
+                angX = std::atan((mwpc1x - mwpc2x) / (fMw1GeoPar->GetPosZ() - fMw2GeoPar->GetPosZ()) / 10.);
+                angY = std::atan((mwpc1y - mwpc2y) / (fMw1GeoPar->GetPosZ() - fMw2GeoPar->GetPosZ()) / 10.);
                 if (TMath::Abs(angX) < 0.075 && TMath::Abs(angY) < 0.075 && mwpc2x > -150.)
                 {
                     zrand = gRandom->Uniform(0., fDist_acelerator_glad);
@@ -413,7 +413,7 @@ void R3BIncomingTrackingOnlineSpectra::Exec(Option_t* /*option*/)
                 fh2_angvsposy->Fill(ytarget, angY * 1000.);
             }
         }
-        else if (fMwpc2HitDataCA && fMwpc2HitDataCA->GetEntriesFast() > 0 && fYearConf == 2024)
+        /*else if (fMwpc2HitDataCA && fMwpc2HitDataCA->GetEntriesFast() > 0 && fYearConf == 2024)
         {
 
             nHits = fMwpc1HitDataCA->GetEntriesFast();
@@ -463,7 +463,7 @@ void R3BIncomingTrackingOnlineSpectra::Exec(Option_t* /*option*/)
                     fh2_angvsposy->Fill(ytarget, angY * 1000.);
                 }
             }
-        }
+        }*/
     }
 
     fNEvents += 1;