---

yaml --- r: 73340 b: "refs/heads/CMSSW_7_0_X" c: 8dfac7a h: "refs/heads/CMSSW_7_0_X" v: v3
cms-sw · Sep 15, 2009 · 771316c · 771316c
1 parent 126b66a
commit 771316c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-"refs/heads/CMSSW_7_0_X": d8f20d46ef923dbebe7f192f0b1022d82b245e2f
+"refs/heads/CMSSW_7_0_X": 8dfac7a97b75c4d5ef5522cceb09e7a74913b3cf
diff --git a/trunk/Alignment/CommonAlignmentMonitor/interface/AlignmentMonitorBase.h b/trunk/Alignment/CommonAlignmentMonitor/interface/AlignmentMonitorBase.h
@@ -16,7 +16,7 @@
 //
 // Original Author:  Jim Pivarski
 //         Created:  Fri Mar 30 12:21:02 CDT 2007
-// $Id: AlignmentMonitorBase.h,v 1.8 2008/08/11 20:24:19 pivarski Exp $
+// $Id: AlignmentMonitorBase.h,v 1.9 2009/08/29 18:18:07 pivarski Exp $
 //
 
 // system include files
@@ -82,7 +82,7 @@ class AlignmentMonitorBase {
       /// AlignmentMonitorBase can find your histograms in a
       /// collector (parallel-processing) job)
       TH1F *book1D(std::string dir, std::string name, std::string title, int nchX, double lowX, double highX);
-      TProfile *bookProfile(std::string dir, std::string name, std::string title, int nchX, double lowX, double highX, int nchY=1, double lowY=0., double highY=0., char *option="s");
+      TProfile *bookProfile(std::string dir, std::string name, std::string title, int nchX, double lowX, double highX, int nchY=1, double lowY=0., double highY=0., const char *option="s");
       TH2F *book2D(std::string dir, std::string name, std::string title, int nchX, double lowX, double highX, int nchY, double lowY, double highY);
       TFileDirectory *directory(std::string dir);
 

diff --git a/trunk/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap.cc b/trunk/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap.cc
@@ -962,10 +962,10 @@ void AlignmentMonitorMuonSystemMap::afterAlignment(const edm::EventSetup &iSetup
     double center = prof->GetBinCenter(bin);
 
     for (std::vector<double*>::const_iterator residiter = fitter->first->residualsPos_begin();  residiter != fitter->first->residualsPos_end();  ++residiter) {
-      prof->Fill(center, (*residiter)[MuonResidualsPositionFitter::kResidual]) * 10.;
+      prof->Fill(center, (*residiter)[MuonResidualsPositionFitter::kResidual] * 10.);
     }
     for (std::vector<double*>::const_iterator residiter = fitter->first->residualsNeg_begin();  residiter != fitter->first->residualsNeg_end();  ++residiter) {
-      prof->Fill(center, (*residiter)[MuonResidualsPositionFitter::kResidual]) * 10.;
+      prof->Fill(center, (*residiter)[MuonResidualsPositionFitter::kResidual] * 10.);
     }
   }
   for (std::map<MuonResidualsTwoBin*,std::pair<TProfile*,int> >::const_iterator fitter = m_slopeprofs.begin();  fitter != m_slopeprofs.end();  ++fitter) {
@@ -983,10 +983,10 @@ void AlignmentMonitorMuonSystemMap::afterAlignment(const edm::EventSetup &iSetup
   for (std::map<MuonResidualsTwoBin*,TH1F*>::const_iterator fitter = m_offsethists.begin();  fitter != m_offsethists.end();  ++fitter) {
     TH1F* hist = fitter->second;
     for (std::vector<double*>::const_iterator residiter = fitter->first->residualsPos_begin();  residiter != fitter->first->residualsPos_end();  ++residiter) {
-      hist->Fill((*residiter)[MuonResidualsPositionFitter::kResidual]) * 10.;
+      hist->Fill((*residiter)[MuonResidualsPositionFitter::kResidual] * 10.);
     }
     for (std::vector<double*>::const_iterator residiter = fitter->first->residualsNeg_begin();  residiter != fitter->first->residualsNeg_end();  ++residiter) {
-      hist->Fill((*residiter)[MuonResidualsPositionFitter::kResidual]) * 10.;
+      hist->Fill((*residiter)[MuonResidualsPositionFitter::kResidual] * 10.);
     }
   }
   for (std::map<MuonResidualsTwoBin*,TH1F*>::const_iterator fitter = m_slopehists.begin();  fitter != m_slopehists.end();  ++fitter) {

diff --git a/trunk/Alignment/CommonAlignmentMonitor/src/AlignmentMonitorBase.cc b/trunk/Alignment/CommonAlignmentMonitor/src/AlignmentMonitorBase.cc
@@ -8,7 +8,7 @@
 //
 // Original Author:  Jim Pivarski
 //         Created:  Fri Mar 30 12:21:07 CDT 2007
-// $Id: AlignmentMonitorBase.cc,v 1.8 2008/08/11 20:24:19 pivarski Exp $
+// $Id: AlignmentMonitorBase.cc,v 1.9 2009/08/29 18:18:08 pivarski Exp $
 //
 
 // system include files
@@ -133,7 +133,7 @@ TH1F *AlignmentMonitorBase::book1D(std::string dir, std::string name, std::strin
    return directory(dir)->make<TH1F>(name.c_str(), title.c_str(), nchX, lowX, highX);
 }
 
-TProfile *AlignmentMonitorBase::bookProfile(std::string dir, std::string name, std::string title, int nchX, double lowX, double highX, int nchY, double lowY, double highY, char *option) {
+TProfile *AlignmentMonitorBase::bookProfile(std::string dir, std::string name, std::string title, int nchX, double lowX, double highX, int nchY, double lowY, double highY, const char *option) {
    if (lowY == highY) {
       return directory(dir)->make<TProfile>(name.c_str(), title.c_str(), nchX, lowX, highX, option);
    }

diff --git a/trunk/Alignment/MuonAlignment/interface/MuonScenarioBuilder.h b/trunk/Alignment/MuonAlignment/interface/MuonScenarioBuilder.h
@@ -4,8 +4,8 @@
 /** \class MuonScenarioBuilder
  *  The misalignment scenario builder.
  *
- *  $Date: 2007/12/06 01:38:48 $
- *  $Revision: 1.3 $
+ *  $Date: 2008/04/15 16:05:53 $
+ *  $Revision: 1.4 $
  *  \author Andre Sznajder - UERJ(Brazil)
  */
 
@@ -41,7 +41,7 @@ class MuonScenarioBuilder : public MisalignmentScenarioBuilder
   /// this special method allows to move the complete muon system by a same amount
   void moveMuon( const edm::ParameterSet& scenario );
 
-  std::vector<float> extractParameters( const edm::ParameterSet& , char* );
+  std::vector<float> extractParameters( const edm::ParameterSet& , const char* );
 
   void moveChamberInSector( Alignable *, std::vector<float>, std::vector<float>, std::vector<float> , std::vector<float> );
 private: // Members

diff --git a/trunk/Alignment/MuonAlignment/plugins/MuonGeometryArrange.cc b/trunk/Alignment/MuonAlignment/plugins/MuonGeometryArrange.cc
@@ -418,8 +418,8 @@ void MuonGeometryArrange::endHist(){
 //////////////////////////////////////////////////
 void MuonGeometryArrange::makeGraph(int sizeI, float smi, float sma, 
 	float minV, float maxV,
-	TH2F* dxh, TGraph* grx, char* name, char* title, 
-	char* titleg, char* axis,
+	TH2F* dxh, TGraph* grx, const char* name, const char* title, 
+	const char* titleg, const char* axis,
 	float* xp, float* yp, int size){
 
   if(minV>=maxV || smi>=sma || sizeI<=1 || xp==0x0 || yp==0x0) return;

diff --git a/trunk/Alignment/MuonAlignment/plugins/MuonGeometryArrange.h b/trunk/Alignment/MuonAlignment/plugins/MuonGeometryArrange.h
@@ -14,8 +14,8 @@
  *   path p = { comparator }
  *
  *
- *  $Date: 2008/06/17 15:35:14 $
- *  $Revision: 1.7 $
+ *  $Date: 2008/11/25 22:15:55 $
+ *  $Revision: 1.1 $
  *  \author Nhan Tran
  */
 
@@ -79,8 +79,8 @@ public edm::EDAnalyzer
 	//void createDBGeometry(const edm::EventSetup& iSetup);
 	void createROOTGeometry(const edm::EventSetup& iSetup);
 	void makeGraph(int sizeI, float smi, float sma, float minV,
-	  float maxV, TH2F* dxh, TGraph* grx, char* name, char* title,
-	  char* titleg, char* axis, float* xp, float* yp, int numEntries);
+	  float maxV, TH2F* dxh, TGraph* grx, const char* name, const char* title,
+	  const char* titleg, const char* axis, float* xp, float* yp, int numEntries);
 
 	bool passIdCut( uint32_t );
 	bool checkChosen( Alignable* ali );	// Is ali one of wanted CSC?

diff --git a/trunk/Alignment/MuonAlignment/src/MuonScenarioBuilder.cc b/trunk/Alignment/MuonAlignment/src/MuonScenarioBuilder.cc
@@ -1,7 +1,7 @@
 /** \file
  *
- *  $Date: 2008/10/05 20:12:22 $
- *  $Revision: 1.6 $
+ *  $Date: 2008/11/26 14:57:13 $
+ *  $Revision: 1.7 $
  *  \author Andre Sznajder - UERJ(Brazil)
  */
 
@@ -67,7 +67,7 @@ void MuonScenarioBuilder::applyScenario( const edm::ParameterSet& scenario )
 
 
 
-std::vector<float> MuonScenarioBuilder::extractParameters(const edm::ParameterSet& pSet, char *blockId) {
+std::vector<float> MuonScenarioBuilder::extractParameters(const edm::ParameterSet& pSet, const char *blockId) {
 
   double scale_ = 0, scaleError_ = 0, phiX_ = 0, phiY_ = 0, phiZ_ = 0;
   double dX_ = 0, dY_ = 0, dZ_ = 0;