diff --git a/[refs] b/[refs] index 181b71a03a859..8482aff62e076 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": 28de2303d3a74377329ab2cf706afec3efaeaf87 +"refs/heads/CMSSW_7_1_X": b717757471af7ac81717d02a19ca2ae586dd5b22 diff --git a/trunk/OnlineDB/CSCCondDB/interface/CSCCFEBConnectivityAnalyzer.h b/trunk/OnlineDB/CSCCondDB/interface/CSCCFEBConnectivityAnalyzer.h index 2156ebb8fe8f2..51dc1e4962004 100644 --- a/trunk/OnlineDB/CSCCondDB/interface/CSCCFEBConnectivityAnalyzer.h +++ b/trunk/OnlineDB/CSCCondDB/interface/CSCCFEBConnectivityAnalyzer.h @@ -31,6 +31,7 @@ class TCalibCFEBConnectEvt { Float_t adcMin; Float_t diff; Float_t RMS; + Int_t id; }; class CSCCFEBConnectivityAnalyzer : public edm::EDAnalyzer { diff --git a/trunk/OnlineDB/CSCCondDB/interface/CSCscaAnalyzer.h b/trunk/OnlineDB/CSCCondDB/interface/CSCscaAnalyzer.h index 0650d20b49734..5d6a42c6cd7d0 100644 --- a/trunk/OnlineDB/CSCCondDB/interface/CSCscaAnalyzer.h +++ b/trunk/OnlineDB/CSCCondDB/interface/CSCscaAnalyzer.h @@ -28,6 +28,7 @@ class TCalibSCAEvt { Int_t cham; Int_t ddu; Float_t scaMeanVal; + Int_t id; }; class CSCscaAnalyzer : public edm::EDAnalyzer { diff --git a/trunk/OnlineDB/CSCCondDB/src/CSCCFEBConnectivityAnalyzer.cc b/trunk/OnlineDB/CSCCondDB/src/CSCCFEBConnectivityAnalyzer.cc index da53e236f0c5e..ff0d7f21d9cef 100644 --- a/trunk/OnlineDB/CSCCondDB/src/CSCCFEBConnectivityAnalyzer.cc +++ b/trunk/OnlineDB/CSCCondDB/src/CSCCFEBConnectivityAnalyzer.cc @@ -159,14 +159,14 @@ CSCCFEBConnectivityAnalyzer::~CSCCFEBConnectivityAnalyzer(){ lines++; getline(filein,PSet); - if (lines==3){ + if (lines==2){ name=PSet; } } //get name of run file from .cfg and name root output after that std::string::size_type runNameStart = name.find("\"",0); - std::string::size_type runNameEnd = name.find("bin",0); + std::string::size_type runNameEnd = name.find("raw",0); std::string::size_type rootStart = name.find("Crosstalk",0); int nameSize = runNameEnd+2-runNameStart; int myRootSize = rootStart-runNameStart+8; @@ -193,7 +193,7 @@ CSCCFEBConnectivityAnalyzer::~CSCCFEBConnectivityAnalyzer(){ TCalibCFEBConnectEvt calib_evt; TFile calibfile(myNewName, "RECREATE"); TTree calibtree("Calibration","Connectivity"); - calibtree.Branch("EVENT", &calib_evt, "strip/I:layer/I:cham/I:ddu/I:adcMax/F:adcMin/F:diff/F:RMS/F"); + calibtree.Branch("EVENT", &calib_evt, "strip/I:layer/I:cham/I:ddu/I:adcMax/F:adcMin/F:diff/F:RMS/F:id"); for (int iii=0; iiicrate_chamber(new_crateID,new_dmbID,&chamber_id,&chamber_num,§or,&first_strip_index,&strips_per_layer,&chamber_index); std::cout<<"Data is for chamber:: "<< chamber_id<<" in sector: "<crate_chamber(new_crateID,new_dmbID,&chamber_id,&chamber_num,§or,&first_strip_index,&strips_per_layer,&chamber_index); std::cout<<"Data is for chamber:: "<< chamber_id<<" in sector: "<