[NanoAOD,BTVNano] Btvnano integration as customized module

Alignment/APEEstimation/test/autoSubmitter/unitTest.ini

@@ -1,5 +1,9 @@
 [dataset:wlnu]
+<<<<<<< HEAD
+baseDirectory=$CMSSW_BASE
+=======
 baseDirectory=$CMSSW_BASE/unit_tests/ApeTest
+>>>>>>> 895df58e36cff1d7dc27b1bf37aee7f604adc704
 fileNames=MC_UnitTest_TkAlMuonIsolated_1.root
 isMC=True
 

CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXML.cc

@@ -81,6 +81,7 @@ bool MiscalibReaderFromXML::parseXMLMiscalibFile(std::string configFile) {
   if (linkTagsNum == 0)
     std::cout << "Number of Cells in file is 0 - probably bad file format" << std::endl;
 
+  int count = 0;
   for (unsigned int i = 0; i < linkTagsNum; i++) {
     DOMNode* linkNode = doc->getElementsByTagName(_toDOMS("Cell"))->item(i);
     ///Get ME name
@@ -100,6 +101,7 @@ bool MiscalibReaderFromXML::parseXMLMiscalibFile(std::string configFile) {
     DetId cell = parseCellEntry(attributes);
 
     if (cell != DetId(0)) {
+      count++;
       caloMap_.addCell(cell, scalingfactor);
     } else {
       //		std::cout << "Null received" << std::endl;

CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc

@@ -527,17 +527,19 @@ void CastorLedAnalysis::processLedEvent(const CastorDigiCollection& castor, cons
     evt_curr = m_nevtsample;
 
   // HF/Castor
-  if (castor.empty()) {
-    edm::LogError("CastorLedAnalysis") << "Event with " << (int)castor.size() << "Castor Digis passed." << std::endl;
-    return;
-  }
-  for (CastorDigiCollection::const_iterator j = castor.begin(); j != castor.end(); ++j) {
-    const CastorDataFrame digi = (const CastorDataFrame)(*j);
-    _meol = castorHists.LEDTRENDS.find(digi.id());
-    if (_meol == castorHists.LEDTRENDS.end()) {
-      SetupLEDHists(2, digi.id(), castorHists.LEDTRENDS);
+  try {
+    if (castor.empty())
+      throw(int) castor.size();
+    for (CastorDigiCollection::const_iterator j = castor.begin(); j != castor.end(); ++j) {
+      const CastorDataFrame digi = (const CastorDataFrame)(*j);
+      _meol = castorHists.LEDTRENDS.find(digi.id());
+      if (_meol == castorHists.LEDTRENDS.end()) {
+        SetupLEDHists(2, digi.id(), castorHists.LEDTRENDS);
+      }
+      LedCastorHists(digi.id(), digi, castorHists.LEDTRENDS, cond);
     }
-    LedCastorHists(digi.id(), digi, castorHists.LEDTRENDS, cond);
+  } catch (int i) {
+    //    m_logFile << "Event with " << i<<" Castor Digis passed." << std::endl;
   }
 
   // Call the function every m_nevtsample events

CalibCalorimetry/CastorCalib/src/CastorPedestalAnalysis.cc

@@ -105,31 +105,32 @@ void CastorPedestalAnalysis::processEvent(const CastorDigiCollection& castor, co
 
   m_shape = cond.getCastorShape();
   // HF
-  if (castor.empty()) {
-    edm::LogError("CastorLedAnalysis") << "Event with " << (int)castor.size() << "Castor Digis passed." << std::endl;
-    return;
-  }
-
-  for (CastorDigiCollection::const_iterator j = castor.begin(); j != castor.end(); ++j) {
-    const CastorDataFrame digi = (const CastorDataFrame)(*j);
-    m_coder = cond.getCastorCoder(digi.id());
-    for (int i = m_startTS; i < digi.size() && i <= m_endTS; i++) {
-      for (int flag = 0; flag < 4; flag++) {
-        if (i + flag < digi.size() && i + flag <= m_endTS) {
-          per2CapsHists(flag, 2, digi.id(), digi.sample(i), digi.sample(i + flag), castorHists.PEDTRENDS, cond);
+  try {
+    if (castor.empty())
+      throw(int) castor.size();
+    for (CastorDigiCollection::const_iterator j = castor.begin(); j != castor.end(); ++j) {
+      const CastorDataFrame digi = (const CastorDataFrame)(*j);
+      m_coder = cond.getCastorCoder(digi.id());
+      for (int i = m_startTS; i < digi.size() && i <= m_endTS; i++) {
+        for (int flag = 0; flag < 4; flag++) {
+          if (i + flag < digi.size() && i + flag <= m_endTS) {
+            per2CapsHists(flag, 2, digi.id(), digi.sample(i), digi.sample(i + flag), castorHists.PEDTRENDS, cond);
+          }
         }
       }
+      if (m_startTS == 0 && m_endTS > 4) {
+        AllChanHists(digi.id(),
+                     digi.sample(0),
+                     digi.sample(1),
+                     digi.sample(2),
+                     digi.sample(3),
+                     digi.sample(4),
+                     digi.sample(5),
+                     castorHists.PEDTRENDS);
+      }
     }
-    if (m_startTS == 0 && m_endTS > 4) {
-      AllChanHists(digi.id(),
-                   digi.sample(0),
-                   digi.sample(1),
-                   digi.sample(2),
-                   digi.sample(3),
-                   digi.sample(4),
-                   digi.sample(5),
-                   castorHists.PEDTRENDS);
-    }
+  } catch (int i) {
+    //    m_logFile << "Event with " << i<<" Castor Digis passed." << std::endl;
   }
   // Call the function every m_nevtsample events
   if (m_nevtsample > 0) {

CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h

@@ -145,7 +145,7 @@ class EcnaAnalyzer : public edm::one::EDAnalyzer<> {
   Bool_t AnalysisOutcome(const TString &);
 
 private:
-  constexpr static Int_t fgMaxCar = 512;  // Max nb of caracters for char*
+  Int_t fgMaxCar;  // Max nb of caracters for char*
   TString fTTBELL;
 
   // ----------member data ---------------------------
@@ -177,8 +177,8 @@ class EcnaAnalyzer : public edm::one::EDAnalyzer<> {
   Int_t fCurrentEventNumber;
   Int_t fNbOfSelectedEvents;
 
-  std::vector<Int_t> fBuildEventDistribBad;
-  std::vector<Int_t> fBuildEventDistribGood;
+  Int_t *fBuildEventDistribBad;
+  Int_t *fBuildEventDistribGood;
 
   TString fCfgAnalyzerParametersFilePath;  // absolute path for the analyzer
                                            // parameters files (/afs/etc...)
@@ -209,29 +209,30 @@ class EcnaAnalyzer : public edm::one::EDAnalyzer<> {
   Int_t fStexIndexStop;
 
   Int_t fFedTcc;
-  std::vector<Int_t> fSMFromFedTcc;
-  std::vector<Int_t> fESFromFedTcc;
+  Int_t *fSMFromFedTcc;
+  Int_t *fESFromFedTcc;
+  Int_t *fDeeFromFedTcc;
   Int_t fTreatedFedOrder;
-  std::vector<Int_t> fFedStatusOrder;
+  Int_t *fFedStatusOrder;
   Int_t fFedId;
-  std::vector<std::string> fDeeNumberString;
+  TString *fDeeNumberString;
 
-  Int_t fMaxTreatedStexCounter = 0;
+  Int_t fMaxTreatedStexCounter;
   Int_t fDeeDS5Memo1;
   Int_t fDeeDS5Memo2;
-  std::vector<Int_t> fStexDigiOK;
-  std::vector<Int_t> fStexNbOfTreatedEvents;
-  std::vector<Int_t> fStexStatus;
+  Int_t *fStexDigiOK;
+  Int_t *fStexNbOfTreatedEvents;
+  Int_t *fStexStatus;
 
-  Int_t fMaxFedUnitCounter = 0;
-  std::vector<Int_t> fFedStatus;
-  std::vector<Int_t> fFedDigiOK;
-  std::vector<Int_t> fFedNbOfTreatedEvents;
+  Int_t fMaxFedUnitCounter;
+  Int_t *fFedStatus;
+  Int_t *fFedDigiOK;
+  Int_t *fFedNbOfTreatedEvents;
 
   Int_t fMemoCutOK;
   Int_t fNbOfTreatedStexs;
-  std::vector<Int_t> fNbOfTreatedFedsInDee;
-  std::vector<Int_t> fNbOfTreatedFedsInStex;
+  Int_t *fNbOfTreatedFedsInDee;
+  Int_t *fNbOfTreatedFedsInStex;
 
   Int_t fANY_RUN;
   Int_t fPEDESTAL_STD;
@@ -240,36 +241,39 @@ class EcnaAnalyzer : public edm::one::EDAnalyzer<> {
   Int_t fPHYSICS_GLOBAL;
   Int_t fPEDSIM;
 
-  std::vector<time_t> fTimeFirst;
-  std::vector<time_t> fTimeLast;
-  std::vector<TString> fDateFirst;
-  std::vector<TString> fDateLast;
+  time_t *fTimeFirst;
+  time_t *fTimeLast;
+  TString *fDateFirst;
+  TString *fDateLast;
 
-  std::vector<Int_t> fMemoDateFirstEvent;
+  Int_t *fMemoDateFirstEvent;
 
-  TEcnaObject fMyEcnaEBObjectManager;
-  TEcnaObject fMyEcnaEEObjectManager;
+  TEcnaObject *fMyEcnaEBObjectManager;
+  TEcnaObject *fMyEcnaEEObjectManager;
 
-  std::vector<std::unique_ptr<TEcnaRun>> fMyCnaEBSM;
-  std::vector<std::unique_ptr<TEcnaRun>> fMyCnaEEDee;
+  TEcnaRun **fMyCnaEBSM;
+  TEcnaRun **fMyCnaEEDee;
 
-  TEcnaNumbering fMyEBNumbering;
-  TEcnaParEcal fMyEBEcal;
+  TEcnaNumbering *fMyEBNumbering;
+  TEcnaParEcal *fMyEBEcal;
 
-  TEcnaNumbering fMyEENumbering;
-  TEcnaParEcal fMyEEEcal;
+  TEcnaNumbering *fMyEENumbering;
+  TEcnaParEcal *fMyEEEcal;
 
   //  Int_t** fT2d_LastEvt; // 2D array[channel][sample] max nb of evts read for
   //  a given (channel,sample) Int_t*  fT1d_LastEvt;
 
-  constexpr static Int_t fMaxRunTypeCounter = 26;
-  std::array<Int_t, fMaxRunTypeCounter> fRunTypeCounter;
+  Int_t fMaxRunTypeCounter;
+  Int_t *fRunTypeCounter;
 
-  constexpr static Int_t fMaxMgpaGainCounter = 4;  // Because chozen gain = 0,1,2,3
-  std::array<Int_t, fMaxMgpaGainCounter> fMgpaGainCounter;
+  Int_t fMaxMgpaGainCounter;
+  Int_t *fMgpaGainCounter;
 
-  constexpr static Int_t fMaxFedIdCounter = 54;
-  std::array<Int_t, fMaxFedIdCounter> fFedIdCounter;
+  Int_t fMaxFedIdCounter;
+  Int_t *fFedIdCounter;
+
+  Int_t fMaxCounterQuad;
+  Int_t *fCounterQuad;
 };
 
 #endif