---

yaml --- r: 32748 b: "refs/heads/CMSSW_7_1_X" c: b717757 h: "refs/heads/CMSSW_7_1_X" v: v3
cms-sw · Oct 24, 2007 · 2ff655c · 2ff655c
1 parent 2e1f1f7
commit 2ff655c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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; iii<Nddu; iii++){
     for (int i=0; i<NChambers; i++){
@@ -207,6 +207,8 @@ CSCCFEBConnectivityAnalyzer::~CSCCFEBConnectivityAnalyzer(){
       map->crate_chamber(new_crateID,new_dmbID,&chamber_id,&chamber_num,&sector,&first_strip_index,&strips_per_layer,&chamber_index);
       std::cout<<"Data is for chamber:: "<< chamber_id<<" in sector:  "<<sector<<std::endl;
 
+      calib_evt.id = chamber_num;
+
       for (int j=0; j<LAYERS_con; j++){
 	for (int k=0; k<size[i]; k++){
 

diff --git a/trunk/OnlineDB/CSCCondDB/src/CSCscaAnalyzer.cc b/trunk/OnlineDB/CSCCondDB/src/CSCscaAnalyzer.cc
@@ -200,7 +200,7 @@ CSCscaAnalyzer::~CSCscaAnalyzer(){
   TCalibSCAEvt calib_evt;
   TFile calibfile(myNewName, "RECREATE");
   TTree calibtree("Calibration","SCA");
-  calibtree.Branch("EVENT", &calib_evt, "strip/I:layer/I:cham/I:ddu/I:scaMeanVal/F");
+  calibtree.Branch("EVENT", &calib_evt, "strip/I:layer/I:cham/I:ddu/I:scaMeanVal/F:id/I");
 
   //DB object and map
   CSCobject *cn = new CSCobject();
@@ -219,6 +219,8 @@ CSCscaAnalyzer::~CSCscaAnalyzer(){
       map->crate_chamber(new_crateID,new_dmbID,&chamber_id,&chamber_num,&sector,&first_strip_index,&strips_per_layer,&chamber_index);
       std::cout<<"Data is for chamber:: "<< chamber_id<<" in sector:  "<<sector<<std::endl;
 
+      calib_evt.id = chamber_num;
+
       for (int layeriter=0; layeriter<LAYERS_sca; layeriter++){
 	int layer_id=chamber_num+layeriter+1;
 	for (int stripiter=0; stripiter<STRIPS_sca; stripiter++){