Accept all track combinations in the GUI

pnwkw · shahor02 · commit ec1ded8f76c7 · 2022-06-10T14:56:40.000+02:00
diff --git a/EventVisualisation/DataConverter/src/VisualisationEvent.cxx b/EventVisualisation/DataConverter/src/VisualisationEvent.cxx
@@ -39,29 +39,33 @@ VisualisationEvent::GIDVisualisation VisualisationEvent::mVis = [] {
     if (filter == o2::event_visualisation::EVisualisationGroup::TPC) {
       res.contains[o2::dataformats::GlobalTrackID::TPC][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::ITSTPC][filter] = true;
-      res.contains[o2::dataformats::GlobalTrackID::ITSTPCTRD][filter] = true;
-      res.contains[o2::dataformats::GlobalTrackID::ITSTPCTRDTOF][filter] = true;
+      res.contains[o2::dataformats::GlobalTrackID::TPCTOF][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::TPCTRD][filter] = true;
+      res.contains[o2::dataformats::GlobalTrackID::ITSTPCTRD][filter] = true;
+      res.contains[o2::dataformats::GlobalTrackID::ITSTPCTOF][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::TPCTRDTOF][filter] = true;
-      res.contains[o2::dataformats::GlobalTrackID::TPCTOF][filter] = true;
+      res.contains[o2::dataformats::GlobalTrackID::ITSTPCTRDTOF][filter] = true;
     }
     if (filter == o2::event_visualisation::EVisualisationGroup::ITS) {
       res.contains[o2::dataformats::GlobalTrackID::ITS][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::ITSTPC][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::ITSTPCTRD][filter] = true;
+      res.contains[o2::dataformats::GlobalTrackID::ITSTPCTOF][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::ITSTPCTRDTOF][filter] = true;
     }
     if (filter == o2::event_visualisation::EVisualisationGroup::TRD) {
       res.contains[o2::dataformats::GlobalTrackID::TRD][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::TPCTRD][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::ITSTPCTRD][filter] = true;
+      res.contains[o2::dataformats::GlobalTrackID::TPCTRDTOF][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::ITSTPCTRDTOF][filter] = true;
     }
     if (filter == o2::event_visualisation::EVisualisationGroup::TOF) {
-      res.contains[o2::dataformats::GlobalTrackID::ITSTPCTRDTOF][filter] = true;
-      res.contains[o2::dataformats::GlobalTrackID::TPCTRDTOF][filter] = true;
-      res.contains[o2::dataformats::GlobalTrackID::TPCTOF][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::TOF][filter] = true;
+      res.contains[o2::dataformats::GlobalTrackID::TPCTOF][filter] = true;
+      res.contains[o2::dataformats::GlobalTrackID::ITSTPCTOF][filter] = true;
+      res.contains[o2::dataformats::GlobalTrackID::TPCTRDTOF][filter] = true;
+      res.contains[o2::dataformats::GlobalTrackID::ITSTPCTRDTOF][filter] = true;
     }
     if (filter == o2::event_visualisation::EVisualisationGroup::MFT) {
       res.contains[o2::dataformats::GlobalTrackID::MFT][filter] = true;
@@ -71,6 +75,7 @@ VisualisationEvent::GIDVisualisation VisualisationEvent::mVis = [] {
     if (filter == o2::event_visualisation::EVisualisationGroup::MCH) {
       res.contains[o2::dataformats::GlobalTrackID::MCH][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::MFTMCH][filter] = true;
+      res.contains[o2::dataformats::GlobalTrackID::MCHMID][filter] = true;
       res.contains[o2::dataformats::GlobalTrackID::MFTMCHMID][filter] = true;
     }
     if (filter == o2::event_visualisation::EVisualisationGroup::MID) {
diff --git a/EventVisualisation/View/src/EventManager.cxx b/EventVisualisation/View/src/EventManager.cxx
@@ -96,9 +96,7 @@ void EventManager::displayCurrentEvent()
     displayCalorimeters(event);
 
     for (int i = 0; i < EVisualisationDataType::NdataTypes; ++i) {
-      if (i != EVisualisationGroup::EMC && i != EVisualisationGroup::PHS) {
-        multiView->registerElement(dataTypeLists[i]);
-      }
+      multiView->registerElement(dataTypeLists[i]);
     }
 
     if (vizSettings.firstEvent) {

Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,7 @@ void EventManager::displayCurrentEvent()`
`96`	`96`	`displayCalorimeters(event);`
`97`	`97`
`98`	`98`	`for (int i = 0; i < EVisualisationDataType::NdataTypes; ++i) {`
`99`		`- if (i != EVisualisationGroup::EMC && i != EVisualisationGroup::PHS) {`
`100`		`- multiView->registerElement(dataTypeLists[i]);`
`101`		`- }`
	`99`	`+ multiView->registerElement(dataTypeLists[i]);`
`102`	`100`	`}`
`103`	`101`
`104`	`102`	`if (vizSettings.firstEvent) {`