diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailChannel.h b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailChannel.h
new file mode 100755
index 0000000000000000000000000000000000000000..9d1bc9408f9dd69414406db9f7f657f744c97e36
--- /dev/null
+++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP13DCocktailChannel.h
@@ -0,0 +1,32 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/////////////////////////////////////////////////////////////
+// //
+// Header file for class VP13DCocktailChannel //
+// //
+// Author: Thomas Kittelmann <Thomas.Kittelmann@cern.ch> //
+// //
+// Initial version: June 2007 //
+// //
+/////////////////////////////////////////////////////////////
+
+#ifndef VP13DCOCKTAILCHANNEL_H
+#define VP13DCOCKTAILCHANNEL_H
+
+#include "VP1Base/IVP13DStandardChannelWidget.h"
+
+class VP13DCocktailChannel : public IVP13DStandardChannelWidget {
+
+ Q_OBJECT
+
+public:
+
+ VP13DCocktailChannel();
+ void init();
+ virtual ~VP13DCocktailChannel(){}
+
+};
+
+#endif
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloChannel.h b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloChannel.h
new file mode 100644
index 0000000000000000000000000000000000000000..2652a6714a54613a138bb38056949c0d3b04bcf9
--- /dev/null
+++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/VP13DCocktailPlugin/VP1TrackCaloChannel.h
@@ -0,0 +1,24 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef VP1TRACKCALOCHANNEL_H
+#define VP1TRACKCALOCHANNEL_H
+
+#include "VP1Base/IVP13DStandardChannelWidget.h"
+
+class VP1TrackCaloChannel : public IVP13DStandardChannelWidget {
+
+ Q_OBJECT
+
+public:
+
+ VP1TrackCaloChannel();
+ void init();
+ virtual ~VP1TrackCaloChannel(){}
+
+ //void systemRefreshed(IVP1System*);
+
+};
+
+#endif
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/cmt/requirements b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/cmt/requirements
new file mode 100755
index 0000000000000000000000000000000000000000..34f86a27416b210b910f3e110def0e28431538e1
--- /dev/null
+++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/cmt/requirements
@@ -0,0 +1,35 @@
+package VP13DCocktailPlugin
+
+author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
+manager Riccardo-Maria BIANCHI <rbianchi@cern.ch>
+
+use AtlasPolicy AtlasPolicy-*
+use VP1PlugUtils VP1PlugUtils-* graphics/VP1/VP1Plugins
+use VP1GeometrySystems VP1GeometrySystems-* graphics/VP1/VP1Systems
+use VP1MissingEtSystems VP1MissingEtSystems-* graphics/VP1/VP1Systems
+use VP1SimHitSystems VP1SimHitSystems-* graphics/VP1/VP1Systems
+use VP1CaloSystems VP1CaloSystems-* graphics/VP1/VP1Systems
+use VP1CaloReadoutSystems VP1CaloReadoutSystems-* graphics/VP1/VP1Systems
+use VP1CaloClusterSystems VP1CaloClusterSystems-* graphics/VP1/VP1Systems
+use VP1TrackingGeometrySystems VP1TrackingGeometrySystems-* graphics/VP1/VP1Systems
+
+# Temporarily don't link against VP1TriggerLV1Systems on mac nightlies
+#use VP1TriggerLV1Systems VP1TriggerLV1Systems-* graphics/VP1/VP1Systems
+#macro use_VP1Trigger "VP1TriggerLV1Systems VP1TriggerLV1Systems-* graphics/VP1/VP1Systems" Darwin ""
+#use $(use_VP1Trigger)
+
+use VP1TrackSystems VP1TrackSystems-* graphics/VP1/VP1Systems
+use VP1GuideLineSystems VP1GuideLineSystems-* graphics/VP1/VP1Systems
+use VP1VertexSystems VP1VertexSystems-* graphics/VP1/VP1Systems
+use VP1PRDSystems VP1PRDSystems-* graphics/VP1/VP1Systems
+use VP1RawDataSystems VP1RawDataSystems-* graphics/VP1/VP1Systems
+use VP1UtilitySystems VP1UtilitySystems-* graphics/VP1/VP1Systems
+use VP1BPhysSystems VP1BPhysSystems-* graphics/VP1/VP1Systems
+
+### TODO: to be replaced with the new VP1AODSystems Jet class
+#use VP1JetSystems VP1JetSystems-* graphics/VP1/VP1Systems
+
+### TODO: to be updated when the new Fatras will be available
+#use VP1FatrasSystems VP1FatrasSystems-* graphics/VP1/VP1Systems
+
+apply_pattern vp1plugin
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/share/collisions-Apr2010-IDCalo-Jets.vp1 b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/share/collisions-Apr2010-IDCalo-Jets.vp1
new file mode 100644
index 0000000000000000000000000000000000000000..46e616b9406709964b609ebaa2e575005c083178
Binary files /dev/null and b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/share/collisions-Apr2010-IDCalo-Jets.vp1 differ
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/share/collisions-Apr2010-IDCalo.vp1 b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/share/collisions-Apr2010-IDCalo.vp1
new file mode 100644
index 0000000000000000000000000000000000000000..2ae2cd210d95c64f8f15fd24ea328a6063218c49
Binary files /dev/null and b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/share/collisions-Apr2010-IDCalo.vp1 differ
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/share/point1setup-Apr2010.vp1 b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/share/point1setup-Apr2010.vp1
new file mode 100644
index 0000000000000000000000000000000000000000..13916e6c119e0badf3eafce927c8817ee2202956
Binary files /dev/null and b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/share/point1setup-Apr2010.vp1 differ
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/src/VP13DCocktailChannel.cxx b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/src/VP13DCocktailChannel.cxx
new file mode 100755
index 0000000000000000000000000000000000000000..5a55c2c8a72082ce0ae2f31590ebb0929a181904
--- /dev/null
+++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/src/VP13DCocktailChannel.cxx
@@ -0,0 +1,101 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/////////////////////////////////////////////////////////////
+// //
+// Implementation of class VP13DCocktailChannel //
+// //
+// Author: Thomas Kittelmann <Thomas.Kittelmann@cern.ch> //
+// //
+// Initial version: June 2007 //
+// //
+/////////////////////////////////////////////////////////////
+
+#include "VP13DCocktailPlugin/VP13DCocktailChannel.h"
+#include "VP1GeometrySystems/VP1GeometrySystem.h"
+#include "VP1MissingEtSystems/VP1MissingEtSystem.h"
+#include "VP1SimHitSystems/VP1SimHitSystem.h"
+#include "VP1CaloSystems/VP1CaloCellSystem.h"
+#include "VP1TrackingGeometrySystems/VP1TrackingGeometrySystem.h"
+
+/*
+#ifndef __APPLE__
+#include "VP1TriggerLV1Systems/VP1TrigROISystem.h"
+#include "VP1TriggerLV1Systems/VP1TriggerGeometrySystem.h"
+#endif
+*/
+
+#include "VP1TrackSystems/VP1TrackSystem.h"
+#include "VP1GuideLineSystems/VP1GuideLineSystem.h"
+//#include "VP1JetSystems/VP1JetSystem.h"
+#include "VP1VertexSystems/VP1VertexSystem.h"
+#include "VP1PRDSystems/VP1PrepRawDataSystem.h"
+#include "VP1RawDataSystems/VP1RawDataSystem.h"
+#include "VP1UtilitySystems/VP1ExtraInputSystem.h"
+#include "VP1UtilitySystems/VP1PartSpectSystem.h"
+//#include "VP1FatrasSystems/VP1FatrasSingleTrackSimSystem.h" // TODO: to be updated when the new Fatras will be available
+#include "VP1CaloClusterSystems/VP1CaloClusterSystem.h"
+#include "VP1PlugUtils/VP1SysConf.h"
+#include "VP1CaloReadoutSystems/VP1CaloReadoutSystem.h"
+#include "VP1BPhysSystems/VP1BPhysSystem.h"
+
+
+VP13DCocktailChannel::VP13DCocktailChannel()
+ : IVP13DStandardChannelWidget(VP1CHANNELNAMEINPLUGIN(VP13DCocktailChannel,"3DCocktail"),
+ "This channel shows essentially all 3D systems.",
+ "Thomas.Kittelmann@cern.ch")
+{
+}
+
+void VP13DCocktailChannel::init()
+{
+ VP1GuideLineSystem * guidelinesystem = new VP1GuideLineSystem;
+ addSystem(guidelinesystem);
+ VP1GeometrySystem * geosys = new VP1GeometrySystem(VP1GeoFlags::AllMuonChambers);
+ addSystem(geosys);
+
+
+ /* TODO: to be updated when the new Fatras will be available
+ if (VP1FatrasSingleTrackSimSystem::singleTrackSimAlgorithmIsAvailable())
+ addSystem(new VP1FatrasSingleTrackSimSystem);
+ */
+
+ VP1TrackSystem * tracksys = new VP1TrackSystem;
+ addSystem(tracksys,IVP13DStandardChannelWidget::StartDisabled);
+
+ VP1PrepRawDataSystem * prdsys = new VP1PrepRawDataSystem;
+ addSystem(prdsys, IVP13DStandardChannelWidget::StartDisabled);
+
+ addSystem(new VP1CaloCellSystem,IVP13DStandardChannelWidget::StartDisabled);
+ addSystem(new VP1CaloClusterSystem,IVP13DStandardChannelWidget::StartDisabled);
+ //addSystem(new VP1JetSystem,IVP13DStandardChannelWidget::StartDisabled); // TODO: has to be updated with the new xAOD Jet class
+ addSystem(new VP1MissingEtSystem,IVP13DStandardChannelWidget::StartDisabled);
+ addSystem(new VP1RawDataSystem, IVP13DStandardChannelWidget::StartDisabled);
+ addSystem(new VP1SimHitSystem,IVP13DStandardChannelWidget::StartDisabled);
+ addSystem(new VP1TrackingGeometrySystem, IVP13DStandardChannelWidget::StartDisabled);
+/*
+#ifndef __APPLE__
+ addSystem(new VP1TriggerGeometrySystem,IVP13DStandardChannelWidget::StartDisabled);
+ addSystem(new VP1TrigROISystem,IVP13DStandardChannelWidget::StartDisabled);
+#endif
+*/
+ VP1VertexSystem* vertexsys = new VP1VertexSystem;
+ addSystem(vertexsys,IVP13DStandardChannelWidget::StartDisabled);
+
+ addSystem(new VP1ExtraInputSystem(),IVP13DStandardChannelWidget::StartDisabled);
+ addSystem(new VP1CaloReadoutSystem,IVP13DStandardChannelWidget::StartDisabled);
+ addSystem(new VP1BPhysSystem,IVP13DStandardChannelWidget::StartDisabled);
+
+ VP1PartSpectSystem* partspectsys = new VP1PartSpectSystem();
+ addSystem(partspectsys,IVP13DStandardChannelWidget::StartDisabled);
+
+ QObject::connect(geosys,SIGNAL(plotSpectrum(QStack<QString>&,int)),partspectsys,SLOT(plotSpectrum(QStack<QString>&,int)));
+
+ foreach(QString n,VP1SysConf::extraGeometrySystems())
+ addSystem(new VP1GeometrySystem(VP1GeoFlags::None,n),IVP13DStandardChannelWidget::StartDisabled);
+ foreach(QString n,VP1SysConf::extraTrackSystems())
+ addSystem(new VP1TrackSystem(n),IVP13DStandardChannelWidget::StartDisabled);
+
+ VP1SysConf::setupStandardConnectionsAndOptions( guidelinesystem,geosys,tracksys,prdsys,vertexsys,VP1SysConf::EVENTSTUDIES );
+}
diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/src/VP1TrackCaloChannel.cxx b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/src/VP1TrackCaloChannel.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..498979b29715064ea5afc8b0601b0d1587b75f08
--- /dev/null
+++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/src/VP1TrackCaloChannel.cxx
@@ -0,0 +1,57 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+#include "VP13DCocktailPlugin/VP1TrackCaloChannel.h"
+#include "VP1TrackSystems/VP1TrackSystem.h"
+#include "VP1GeometrySystems/VP1GeometrySystem.h"
+#include "VP1GuideLineSystems/VP1GuideLineSystem.h"
+#include "VP1CaloSystems/VP1CaloCellSystem.h"
+#include "VP1PRDSystems/VP1PrepRawDataSystem.h"
+//#include "VP1FatrasSystems/VP1FatrasSingleTrackSimSystem.h" // TODO: to be updated when the new Fatras will be available
+
+#include "VP1CaloClusterSystems/VP1CaloClusterSystem.h"
+#include "VP1PlugUtils/VP1SysConf.h"
+
+VP1TrackCaloChannel::VP1TrackCaloChannel()
+ : IVP13DStandardChannelWidget(VP1CHANNELNAMEINPLUGIN(VP1TrackCaloChannel,"TrackCalo"),
+ "This channel displays various systems related to Tracking and Calo.",
+ "Thomas.Kittelmann@cern.ch, Edward.moyse@cern.ch, Vakhtang.Tsulaia@cern.ch")
+{
+}
+
+void VP1TrackCaloChannel::init()
+{
+
+ /* // TODO: to be updated when the new Fatras will be available
+ if (VP1FatrasSingleTrackSimSystem::singleTrackSimAlgorithmIsAvailable())
+ addSystem(new VP1FatrasSingleTrackSimSystem);
+ */
+
+
+ VP1GuideLineSystem * guidelinesystem = new VP1GuideLineSystem;
+ addSystem(guidelinesystem);
+
+ VP1GeometrySystem * geosys = new VP1GeometrySystem(VP1GeoFlags::AllMuonChambers);
+ addSystem(geosys);
+
+
+ VP1TrackSystem * tracksys = new VP1TrackSystem;
+ addSystem(tracksys);
+
+ VP1PrepRawDataSystem* prdsys = new VP1PrepRawDataSystem;
+ addSystem(prdsys);
+
+ addSystem(new VP1CaloCellSystem());
+ addSystem(new VP1CaloClusterSystem,IVP13DStandardChannelWidget::StartDisabled);
+
+ foreach(QString n,VP1SysConf::extraGeometrySystems())
+ addSystem(new VP1GeometrySystem(VP1GeoFlags::None,n),IVP13DStandardChannelWidget::StartDisabled);
+ foreach(QString n,VP1SysConf::extraTrackSystems())
+ addSystem(new VP1TrackSystem(n),IVP13DStandardChannelWidget::StartDisabled);
+
+ VP1SysConf::setupStandardConnectionsAndOptions( guidelinesystem,geosys,tracksys,prdsys,0,VP1SysConf::EVENTSTUDIES );
+
+
+}