Commit 45fb74bf authored by Atlas-Software Librarian's avatar Atlas-Software Librarian Committed by Graeme Stewart
Browse files

'CMakeLists.txt' (RPCcablingInterface-00-00-44)

parent 83d04c8a
################################################################################
# Package: RPCcablingInterface
################################################################################
# Declare the package name:
atlas_subdir( RPCcablingInterface )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
DetectorDescription/Identifier
GaudiKernel
MuonSpectrometer/MuonCablings/MuonCablingTools
MuonSpectrometer/MuonIdHelpers
PRIVATE
Control/StoreGate )
# Component(s) in the package:
atlas_add_library( RPCcablingInterfaceLib
src/*.cxx
PUBLIC_HEADERS RPCcablingInterface
LINK_LIBRARIES AthenaKernel Identifier GaudiKernel MuonCablingTools CablingTools MuonIdHelpersLib StoreGateLib SGtests )
atlas_add_component( RPCcablingInterface
src/components/*.cxx
LINK_LIBRARIES AthenaKernel Identifier GaudiKernel MuonCablingTools CablingTools MuonIdHelpersLib StoreGateLib SGtests RPCcablingInterfaceLib )
# Install files from the package:
atlas_install_python_modules( python/__init__.py )
2015-05-24 Jochen Meyer <jomeyer@mail.cern.ch>
* tagged as RPCcablingInterface-00-00-44
* removing gcc 2.95 specific code
2015-05-11 Jochen Meyer <jomeyer@mail.cern.ch>
* tagged as RPCcablingInterface-00-00-43
* addressing coverity defects 17501, 30010
2015-04-05 Jochen Meyer <jomeyer@mail.cern.ch>
* tagged as RPCcablingInterface-00-00-42
* addressing coverity defects 11190, 11192, 11196-7, 11347, 11735, 11841, 11863, 11924-5
2015-02-23 Rafal Bielski <rafal.bielski@cern.ch>
* tagged as RPCcablingInterface-00-00-41
* IRPCcablingSvc.h: added interfaces for mapping RDO->ROB and ROB->RDO
......
......@@ -120,7 +120,7 @@ class CMAprogram
CMAprogram(const CMAprogram&);
~CMAprogram();
CMAprogram operator=(const CMAprogram&);
CMAprogram& operator=(const CMAprogram&);
const bool* registers(void) const
{return reinterpret_cast<const bool*>(m_threshold_registers);}
......
......@@ -20,7 +20,7 @@ class CablingObject : public BaseObject
CablingObject (const CablingObject&);
~CablingObject(){}
CablingObject operator = (const CablingObject&);
CablingObject& operator = (const CablingObject&);
int number(void) const {return m_number;}
int station(void) const {return m_station;}
......
......@@ -163,16 +163,8 @@ virtual std::list<RPCofflineId> give_strip_id (unsigned short int Subsystem
inline std::ostream&
operator<<(std::ostream& stream,const CablingRPCBase& logic)
{
#if (__GNUC__) && (__GNUC__ > 2)
// put your gcc 3.2 specific code here
__osstream display;
#else
// put your gcc 2.95 specific code here
char buffer[1000];
for (int i=0;i<1000;++i) buffer[i] = '\0';
__osstream display(buffer,1000);
#endif
__osstream display;
(&logic)->PrintMap(display);
stream << display.str();
return stream;
......
......@@ -130,7 +130,7 @@ class RDOindex
RDOindex(const RDOindex&);
~RDOindex();
RDOindex operator=(const RDOindex&);
RDOindex& operator=(const RDOindex&);
operator bool();
bool operator !();
......
......@@ -15,6 +15,16 @@ struct RPCofflineId {
int gasGap;
int measuresPhi;
int strip;
void init() {
stationEta = -99;
stationPhi = -99;
doubletR = -99;
doubletZ = -99;
doubletPhi = -99;
gasGap = -99;
measuresPhi = -99;
strip = -99;
}
};
#endif
......@@ -9,18 +9,8 @@
#define TRIGGERIDENTITY_H
#include <iostream>
// for compatibility between gcc2.95 and gcc3.2
#if (__GNUC__) && (__GNUC__ > 2)
// put your gcc 3.2 specific code here
#include <sstream>
typedef std::ostringstream __osstream;
#else
// put your gcc 2.95 specific code here
#include <strstream>
typedef ostrstream __osstream;
#endif
#include <sstream>
typedef std::ostringstream __osstream;
#define NTYPE 3
#define NTHRESHOLD 3
......@@ -46,7 +36,7 @@ class TRIGGERidentity
TRIGGERidentity(TrigType,Threshold,bool);
TRIGGERidentity(const TRIGGERidentity&);
TRIGGERidentity operator=(const TRIGGERidentity&);
TRIGGERidentity& operator=(const TRIGGERidentity&);
bool operator==(const TRIGGERidentity&) const;
bool operator!=(const TRIGGERidentity&) const;
bool operator< (const TRIGGERidentity&) const;
......@@ -68,15 +58,7 @@ class TRIGGERidentity
template <class X> X& operator<<(X& stream,const TRIGGERidentity& data)
{
#if (__GNUC__) && (__GNUC__ > 2)
// put your gcc 3.2 specific code here
__osstream display;
#else
// put your gcc 2.95 specific code here
char buffer[10000];
for (int i=0;i<10000;++i) buffer[i] = '\0';
__osstream display(buffer,10000);
#endif
data.Print(display,false);
stream << display.str();
......
......@@ -180,7 +180,7 @@ ostream& operator<<(ostream& stream, const CMAidentity& id)
std::string covtag(exttag);
std::string type = (id.type())?" phi cma " + covtag : " eta cma " + covtag;
std::string type = (id.type() == Phi )?" phi cma " + covtag : " eta cma " + covtag;
if(covtag != "" ) type = type + " ";
stream << type << setw(2) << id.number() << ": Eta ";
stream << setw(2) << id.eta_index();
......
......@@ -491,15 +491,7 @@ CMAparameters::showMt(char display[][90],int ln, TrigType type) const
// Set input for the display
__osstream** disp = new __osstream*[ln];
#if (__GNUC__) && (__GNUC__ > 2)
// put your gcc 3.2 specific code here
for(int i=0;i<ln;++i) disp[i] = new __osstream;
#else
// put your gcc 2.95 specific code here
for(int i=0;i<ln;++i) disp[i] = new __osstream(display[i],90);
#endif
int pivot_loop = (m_pivot_rpc_read < 4)? m_pivot_rpc_read : 3;
int conf_loop = 0;
......@@ -595,8 +587,6 @@ CMAparameters::showMt(char display[][90],int ln, TrigType type) const
}
}
#if (__GNUC__) && (__GNUC__ > 2)
// put your gcc 3.2 specific code here
for(int i=0;i<ln;++i)
{
std::string tmp = (*disp[i]).str();
......@@ -604,10 +594,8 @@ CMAparameters::showMt(char display[][90],int ln, TrigType type) const
display[i][tmp.length()] = 0;
delete disp[i];
}
#else
// put your gcc 2.95 specific code here
for(int i=0;i<ln;++i) {*disp[i] << ends;delete disp[i];}
#endif
delete[] disp;
}
......
......@@ -8,6 +8,8 @@
using namespace std;
CMAprogram::CMAprogram() :
m_isnewcab(false), m_overlap1(0xff), m_overlap2(0xff000000),
m_trig_local_direc_i(0x1), m_trig_local_direc_j(0x1), m_trig_k_readout(0x0),
m_main_control(0x60), m_main_count(0x0), m_main_status(0x0),
......@@ -511,7 +513,8 @@ CMAprogram::CMAprogram(const CMAprogram& program)
m_l1c_pre = program.l1c_pre();
m_bcc_pre = program.bcc_pre();
m_isnewcab = program.m_isnewcab;
copy_threshold(program.registers());
copy_program(program.bytes());
}
......@@ -519,7 +522,7 @@ CMAprogram::CMAprogram(const CMAprogram& program)
CMAprogram::~CMAprogram()
{}
CMAprogram
CMAprogram&
CMAprogram::operator=(const CMAprogram& program)
{
if (this!=&program) {
......@@ -678,6 +681,7 @@ CMAprogram::read(DBline& data)
while (data("th") >> th >> "thr_reg" >> ch >> data.dbhex()
>> first_word >> second_word >> data.dbdec())
{
if(th < 1) return false;
m_program_bytes[th-1][ch][1] = first_word;
m_program_bytes[th-1][ch][0] = second_word;
......@@ -935,6 +939,7 @@ CMAprogram::read_v02(DBline& data)
while (data("th") >> th >> "thr_reg" >> ch >> data.dbhex()
>> first_word >> second_word >> data.dbdec())
{
if(th < 1) return false;
m_program_bytes[th-1][ch][1] = first_word;
m_program_bytes[th-1][ch][0] = second_word;
......
......@@ -21,7 +21,7 @@ CablingObject::CablingObject(const CablingObject& obj) :
m_sector_type = obj.sector_type();
}
CablingObject
CablingObject&
CablingObject::operator=(const CablingObject& obj)
{
if (this!=&obj) {
......@@ -45,16 +45,7 @@ void
CablingObject::error_header(void) const
{
#if (__GNUC__) && (__GNUC__ > 2)
// put your gcc 3.2 specific code here
__osstream disp;
#else
// put your gcc 2.95 specific code here
char buffer[5000];
for(int i=0;i<5000;++i) buffer[i] = '\0';
__osstream disp(buffer,5000);
#endif
disp << "Error in Sector Type " << m_sector_type;
if( m_station >0 ) disp << ", station " << m_station << ":" << endl;
else disp << ":" << endl;
......
......@@ -106,7 +106,7 @@ RDOindex::operator !()
return !m_status;
}
RDOindex
RDOindex&
RDOindex::operator=(const RDOindex& index)
{
if (this!=&index) {
......
......@@ -36,7 +36,7 @@ TRIGGERidentity::TRIGGERidentity(TrigType type,Threshold threshold,bool flag) :
TRIGGERidentity::TRIGGERidentity(const TRIGGERidentity& id) :
m_type(id.type()),m_threshold(id.threshold()),m_overlap(id.overlap()) {}
TRIGGERidentity
TRIGGERidentity&
TRIGGERidentity::operator=(const TRIGGERidentity& id)
{
if (this!=&id) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment