PPS full sim specific files only (second part of the splited PR 24420)

Configuration/Eras/python/Modifier_pps_2016_cff.py

@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+pps_2016 =  cms.Modifier()
+

Configuration/Eras/python/Modifier_pps_2017_cff.py

@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+pps_2017 =  cms.Modifier()
+

Configuration/Eras/python/Modifier_pps_2018_cff.py

@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+pps_2018 =  cms.Modifier()
+

Configuration/Geometry/python/GeometryExtended2016_CTPPS_cff.py

@@ -0,0 +1,10 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometry2016aXML_CTPPS_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *

Configuration/Geometry/python/GeometryExtended2017_CTPPS_cff.py

@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometry2017XML_CTPPS_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
+

Configuration/Geometry/python/GeometryExtended2018_CTPPS_cff.py

@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometry2018XML_CTPPS_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
+

Configuration/StandardSequences/python/DigiToRaw_cff.py

@@ -17,9 +17,10 @@
 from EventFilter.CastorRawToDigi.CastorDigiToRaw_cfi import *
 from EventFilter.RawDataCollector.rawDataCollector_cfi import *
 from L1Trigger.Configuration.L1TDigiToRaw_cff import *
+from EventFilter.CTPPSRawToDigi.ctppsDigiToRaw_cff import *
 
 #DigiToRaw = cms.Sequence(L1TDigiToRaw*siPixelRawData*SiStripDigiToRaw*ecalPacker*esDigiToRaw*hcalRawData*cscpacker*dtpacker*rpcpacker*rawDataCollector)
-DigiToRaw = cms.Sequence(L1TDigiToRaw*siPixelRawData*SiStripDigiToRaw*ecalPacker*esDigiToRaw*hcalRawData*cscpacker*dtpacker*rpcpacker*castorRawData*rawDataCollector)
+DigiToRaw = cms.Sequence(L1TDigiToRaw*siPixelRawData*SiStripDigiToRaw*ecalPacker*esDigiToRaw*hcalRawData*cscpacker*dtpacker*rpcpacker*ppsRawData*castorRawData*rawDataCollector)
 
 ecalPacker.Label = 'simEcalDigis'
 ecalPacker.InstanceEB = 'ebDigis'
@@ -52,4 +53,5 @@
 phase2_muon.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([rpcpacker]))
 
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
-fastSim.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([siPixelRawData,SiStripDigiToRaw,castorRawData]))
+fastSim.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([siPixelRawData,SiStripDigiToRaw,castorRawData,ppsRawData]))
+

Configuration/StandardSequences/python/Digi_cff.py

@@ -20,6 +20,12 @@
 #
 from SimMuon.Configuration.SimMuon_cff import *
 #
+# PPS Digis 
+# returns sequence "ppsDigi"
+#
+from SimPPS.Configuration.SimPPS_cff import *
+# 
+#
 # TrackingParticle Producer is now part of the mixing module, so
 # it is no longer run here.
 #
@@ -30,7 +36,7 @@
 from GeneratorInterface.Core.generatorSmeared_cfi import *
 from SimGeneral.PileupInformation.genPUProtons_cfi import *
 
-doAllDigi = cms.Sequence(generatorSmeared*calDigi+muonDigi)
+doAllDigi = cms.Sequence(generatorSmeared*calDigi+muonDigi+ppsDigi)
 pdigi = cms.Sequence(generatorSmeared*fixGenInfo*cms.SequencePlaceholder("randomEngineStateProducer")*cms.SequencePlaceholder("mix")*doAllDigi*addPileupInfo*genPUProtons)
 pdigi_valid = cms.Sequence(pdigi)
 pdigi_nogen=cms.Sequence(generatorSmeared*cms.SequencePlaceholder("randomEngineStateProducer")*cms.SequencePlaceholder("mix")*doAllDigi*addPileupInfo*genPUProtons)
@@ -48,7 +54,6 @@ def _fastSimDigis(process):
     # use an alias to make the mixed track collection available under the usual label
     from FastSimulation.Configuration.DigiAliases_cff import loadDigiAliases
     loadDigiAliases(process)
-# no need for the aliases for premixing stage1
 modifyDigi_fastSimDigis = (fastSim & ~premix_stage1).makeProcessModifier(_fastSimDigis)
 
 #phase 2 common mods
@@ -62,3 +67,4 @@ def _modifyEnableHcalHardcode( theProcess ):
 modifyEnableHcalHardcode_ = hcalHardcodeConditions.makeProcessModifier( _modifyEnableHcalHardcode )
 
 
+

Configuration/StandardSequences/python/Eras.py

@@ -55,7 +55,8 @@ def __init__(self):
                            'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'trackingPhase2PU140','highBetaStar_2018',
                            'tracker_apv_vfp30_2016', 'pf_badHcalMitigation', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X',
                            'run2_nanoAOD_94XMiniAODv1', 'run2_nanoAOD_94XMiniAODv2', 'run2_nanoAOD_94X2016',
-                           'hcalHardcodeConditions', 'hcalSkipPacker']
+                           'hcalHardcodeConditions', 'hcalSkipPacker',
+                           'pps_2016', 'pps_2017', 'pps_2018']
         internalUseModChains = ['run2_2017_noTrackingModifier']
 
 

EventFilter/CTPPSRawToDigi/interface/CTPPSElectronicIndex.h

@@ -0,0 +1,8 @@
+#ifndef EventFilter_CTPPSRawToDigi_CTPPSElectronicIndex_H
+#define EventFilter_CTPPSRawToDigi_CTPPSElectronicIndex_H
+
+namespace ctppspixelobjects {
+  struct CTPPSElectronicIndex { int link; int roc; int dcol; int pxid; }; 
+}
+
+#endif

EventFilter/CTPPSRawToDigi/interface/CTPPSPixelDataFormatter.h

@@ -39,6 +39,10 @@
 
 #include "EventFilter/CTPPSRawToDigi/interface/RPixErrorChecker.h"
 
+#include "CondFormats/CTPPSReadoutObjects/interface/CTPPSPixelIndices.h"
+#include "EventFilter/CTPPSRawToDigi/interface/CTPPSElectronicIndex.h"
+#include "FWCore/Utilities/interface/typedefs.h"
+
 #include <cstdint>
 #include <vector>
 #include <map>
@@ -48,47 +52,65 @@ class RPixErrorChecker;
 
 class CTPPSPixelDataFormatter {
 
-public:
+  public:
+
+    typedef edm::DetSetVector<CTPPSPixelDigi> Collection;
+
+    typedef std::unordered_map<int, FEDRawData> RawData;
+    typedef std::vector<CTPPSPixelDigi> DetDigis;
 
-  typedef edm::DetSetVector<CTPPSPixelDigi> Collection;
+    typedef std::vector<CTPPSPixelDataError> DetErrors;
+    typedef std::map<uint32_t, DetErrors> Errors;
 
-  typedef std::map<int, FEDRawData> RawData;
-  typedef std::vector<CTPPSPixelDigi> DetDigis;
+    typedef uint32_t Word32;
+    typedef uint64_t Word64;
 
-  typedef std::vector<CTPPSPixelDataError> DetErrors;
-  typedef std::map<uint32_t, DetErrors> Errors;
+    typedef std::unordered_map<cms_uint32_t,DetDigis> Digis;
 
-  typedef uint32_t Word32;
-  typedef uint64_t Word64;
+    CTPPSPixelDataFormatter(std::map<CTPPSPixelFramePosition, CTPPSPixelROCInfo> const &mapping);
 
-  CTPPSPixelDataFormatter(std::map<CTPPSPixelFramePosition, CTPPSPixelROCInfo> const &mapping);
+    void setErrorStatus(bool theErrorStatus);
 
-  void setErrorStatus(bool theErrorStatus);
+    int nWords() const { return m_WordCounter; }
 
-  int nWords() const { return m_WordCounter; }
+    void interpretRawData( bool& errorsInEvent, int fedId,  const FEDRawData & data, Collection & digis, Errors & errors);
 
-  void interpretRawData( bool& errorsInEvent, int fedId,  const FEDRawData & data, Collection & digis, Errors & errors);
+    int nDigis() const { return m_DigiCounter; }
 
+    struct PPSPixelIndex { 
+      uint32_t id; 
+      unsigned int roc; 
+      short unsigned int rocch; 
+      short unsigned int fedid; 
+      short unsigned int fedch;
+    };
 
+    void formatRawData( unsigned int lvl1_ID, RawData & fedRawData, const Digis & digis, std::vector<PPSPixelIndex> v_iDdet2fed);
 
-private:
+    static bool compare(const PPSPixelIndex& a, const PPSPixelIndex& b) {
+      return a.id < b.id || (a.id == b.id && a.roc < b.roc);
+    }
 
+  private:
 
-  mutable int m_WordCounter;
+    mutable int m_WordCounter;
 
-  bool m_IncludeErrors;
-  RPixErrorChecker m_ErrorCheck;
+    bool m_IncludeErrors;
+    RPixErrorChecker m_ErrorCheck;
 
-  int m_ADC_shift, m_PXID_shift, m_DCOL_shift, m_ROC_shift, m_LINK_shift;
-  Word32 m_LINK_mask, m_ROC_mask, m_DCOL_mask, m_PXID_mask, m_ADC_mask;
-
+    int m_ADC_shift, m_PXID_shift, m_DCOL_shift, m_ROC_shift, m_LINK_shift;
+    Word32 m_LINK_mask, m_ROC_mask, m_DCOL_mask, m_PXID_mask, m_ADC_mask;
 
-  int checkError(const Word32& data) const;
+    int checkError(const Word32& data) const;
 
-  std::string print(const Word64& word) const;
+    std::string print(const Word64& word) const;
 
-  const std::map<CTPPSPixelFramePosition, CTPPSPixelROCInfo> &m_Mapping;
+    const std::map<CTPPSPixelFramePosition, CTPPSPixelROCInfo> &m_Mapping;
 
+    mutable int m_DigiCounter;
+    int m_allDetDigis;
+    int m_hasDetDigis;
+    CTPPSPixelIndices theIndices;
 };
 
 #endif

EventFilter/CTPPSRawToDigi/interface/CTPPSTotemDataFormatter.h

@@ -0,0 +1,74 @@
+/****************************************************************************
+ *
+ * This is a part of the TOTEM offline software.
+ * Authors: 
+ *
+ ****************************************************************************/
+
+#ifndef EventFilter_CTPPSRawToDigi_CTPPSTotemDataFormatter_h
+#define EventFilter_CTPPSRawToDigi_CTPPSTotemDataFormatter_h
+
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
+
+#include "CondFormats/CTPPSReadoutObjects/interface/TotemDAQMapping.h"
+
+#include "DataFormats/CTPPSDigi/interface/TotemRPDigi.h"
+#include "DataFormats/CTPPSDigi/interface/TotemVFATStatus.h"
+#include "DataFormats/CTPPSDigi/interface/CTPPSDiamondDigi.h"
+
+#include "FWCore/Utilities/interface/typedefs.h"
+#include "DataFormats/FEDRawData/interface/FEDRawData.h"
+#include "DataFormats/FEDRawData/interface/FEDHeader.h"
+#include "DataFormats/FEDRawData/interface/FEDTrailer.h"
+#include <cstdint>
+#include <vector>
+#include <map>
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "DataFormats/CTPPSDigi/interface/TotemVFATStatus.h"
+#include "EventFilter/CTPPSRawToDigi/interface/VFATFrame.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+/// \brief Collection of code to convert TOTEM raw data into digi.
+
+class FEDRawData;
+class CTPPSTotemDigiToRaw;  
+
+class CTPPSTotemDataFormatter {
+
+  private:
+    typedef uint16_t Word16;
+    typedef uint32_t Word32;
+    typedef uint64_t Word64;
+
+    mutable int m_WordCounter;
+    mutable int m_DigiCounter;
+
+  public:
+
+    typedef std::unordered_map<int, FEDRawData> RawData;
+    typedef std::vector<TotemRPDigi> DetDigis;
+    typedef std::unordered_map<cms_uint32_t,DetDigis> Digis;
+
+    CTPPSTotemDataFormatter(std::map<TotemFramePosition, TotemVFATInfo> const &mapping);
+
+    int nWords() const { return m_WordCounter; }
+    int nDigis() const { return m_DigiCounter; }
+
+    struct PPSStripIndex { 
+      uint32_t id; 
+      unsigned int hwid; 
+      short unsigned int fedid; 
+      short unsigned int idxinfiber; 
+      short unsigned int gohid; 
+    };
+
+    void formatRawData(unsigned int lvl1_ID, RawData & fedRawData, const Digis & digis, std::vector<PPSStripIndex> v_iDdet2fed ) ; 
+
+    static bool compare(const PPSStripIndex& a, const PPSStripIndex& b) {
+      return a.id < b.id; // || (a.id == b.id && a.roc < b.roc);
+    }
+
+    std::string print(const Word64 & word) const;
+};
+
+#endif

EventFilter/CTPPSRawToDigi/interface/VFATFrame.h

@@ -157,6 +157,9 @@ class VFATFrame
     /// If binary is true, binary format is used.
     void Print(bool binary = false) const;
 
+    /// internaly used to check CRC
+    static word calculateCRC(word crc_in, word dato);
+
   protected:
     /** Raw data frame as sent by electronics.
     * The container is organized as follows (reversed Figure 8 at page 23 of VFAT2 manual):
@@ -186,9 +189,6 @@ class VFATFrame
     /// Number of clusters.
     /// Only available in cluster mode and if the number of clusters exceeds a limit (10).
     uint8_t numberOfClusters;
-
-    /// internaly used to check CRC
-    static word calculateCRC(word crc_in, word dato);
 };                                                                     
 
 #endif