Merge branch 'CMSSW_7_1_X' of https://github.com/cms-sw/cmssw into 71…

…X-photon Use this branch in CMSSW_7_1_X_2014-02-06-0200 or later.
cms-sw · Feb 6, 2014 · 598a1de · 598a1de
2 parents 5816abb + 76b8a37
commit 598a1de
Show file tree

Hide file tree

Showing 154 changed files with 15,707 additions and 7,229 deletions.
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaGui.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaGui.h
@@ -179,20 +179,20 @@
 ///       TEcnaParPaths* pCnaParPaths = new TEcnaParPaths(MyEcnaObjectManager);
 ///       if( pCnaParPaths->GetPaths() == kTRUE )
 ///         {
-///           cout << "*EcnaGuiEB> Starting ROOT session" << endl;
+///           std::cout << "*EcnaGuiEB> Starting ROOT session" << std::endl;
 ///           TRint theApp("App", &argc, argv);
 ///           
-///           cout << "*EcnaGuiEB> Starting ECNA session" << endl;
+///           std::cout << "*EcnaGuiEB> Starting ECNA session" << std::endl;
 ///           TEcnaGui* mainWin = new TEcnaGui(MyEcnaObjectManager, "EB", gClient->GetRoot(), 395, 710);
 ///           mainWin->DialogBox();
 ///           Bool_t retVal = kTRUE;
 ///           theApp.Run(retVal);
-///           cout << "*EcnaGuiEB> End of ECNA session." << endl;
+///           std::cout << "*EcnaGuiEB> End of ECNA session." << std::endl;
 ///           delete mainWin;
 ///     
-///           cout << "*EcnaGuiEB> End of ROOT session." << endl;
+///           std::cout << "*EcnaGuiEB> End of ROOT session." << std::endl;
 ///           theApp.Terminate(0);
-///           cout << "*EcnaGuiEB> Exiting main program." << endl;
+///           std::cout << "*EcnaGuiEB> Exiting main program." << std::endl;
 ///           exit(0);
 ///         }
 ///     }
@@ -878,7 +878,7 @@ class TEcnaGui : public TGMainFrame {
 
   //==================================================== Miscellaneous parameters
 
-  //ofstream fFcout_f;
+  //std::ofstream fFcout_f;
 
   TString  fKeyAnaType;           // Type of analysis
 

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParPaths.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParPaths.h
@@ -36,11 +36,11 @@ class TEcnaParPaths : public TObject {
 
   Int_t   fCnaCommand,  fCnaError;
 
-  ifstream fFcin_rr;          // stream for results root files 
-  ifstream fFcin_ra;          // stream for results ascii files 
-  ifstream fFcin_lor;         // stream for list of runs files
-  //  ifstream fFcin_anapar;      // stream for EcnaAnalyzer parameters files
-  ifstream fFcin_cmssw;       // stream for cmssw version and subsystem 
+  std::ifstream fFcin_rr;          // stream for results root files 
+  std::ifstream fFcin_ra;          // stream for results ascii files 
+  std::ifstream fFcin_lor;         // stream for list of runs files
+  //  std::ifstream fFcin_anapar;      // stream for EcnaAnalyzer parameters files
+  std::ifstream fFcin_cmssw;       // stream for cmssw version and subsystem 
 
   TString fCfgResultsRootFilePath;     // absolute path for the results .root files (/afs/etc...)
   TString fFileForResultsRootFilePath; // name of the file containing the results .root  file path

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRead.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRead.h
@@ -96,7 +96,7 @@
 ///
 ///     if( MyCnaRead->LookAtRootFile() == kFALSE )
 ///        {
-///          cout << "*** ERROR: ROOT file not found" << endl;
+///          std::cout << "*** ERROR: ROOT file not found" << std::endl;
 ///        }
 ///      else
 ///        {
@@ -122,7 +122,7 @@
 ///             }
 ///           else
 ///             {
-///               cout << "problem while reading file. data not available. " << endl;
+///               std::cout << "problem while reading file. data not available. " << std::endl;
 ////            }
 ///
 ///        }

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRun.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRun.h
@@ -504,7 +504,7 @@ class TEcnaRun: public TObject {
   Int_t**     fT2dCrysNumbersTable;
   Int_t*      fT1dCrysNumbersTable;
 
-  ofstream    fFcout_f;
+  std::ofstream    fFcout_f;
 
   Int_t       fFlagPrint;
   Int_t       fCodePrintComments, fCodePrintWarnings, fCodePrintAllComments, fCodePrintNoComment;

diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaWrite.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaWrite.h
@@ -58,7 +58,7 @@ class TEcnaWrite : public TObject {
   TEcnaParPaths  *fCnaParPaths;
   TEcnaParCout   *fCnaParCout;
 
-  ofstream fFcout_f;
+  std::ofstream fFcout_f;
 
   //...................................... Codes for file names
   Int_t fCodeHeaderAscii;