Peter's work from last month

EcalTiming/doc/AlCaPhiSymStream_test.doc

@@ -5,8 +5,24 @@
 Testing file:
 \verbatim
 file=root://eoscms//eos/cms/store/data/Run2015A/AlCaPhiSym/RAW/v1/000/246/908/00000/C0DA4527-2F0A-E511-ADFD-02163E014349.root
-cmsRun test/ ecalTime_fromAlcaStream_cfg.py files=root://eoscms/$file
+cmsRun test/ecalTime_fromAlcaStream_cfg.py files=root://eoscms/$file
 \endverbatim
 
-The code is in debug mode that have to be switched off
+## Options for `cmsRun test/ecalTime_fromAlcaStream_cfg.py`
+Options | Default | Description
+------- | ------- | -------
+files | "" | input files (can be RAW if step contains "RECO")
+output | "" | output files. If TIME in step, it contains the calibration trees, otherwise it will be the RECO files.
+maxEvents | -1 | # of events to run over
+jsonFile |"" | path to the json file which designates which lumisections to use
+step |"RECOTIMEANALYSIS" | Do reco, time analysis or both, RECO or TIMEANALYSIS or RECOTIMEANALYSIS
+offset |0.0 | add this to each crystal time, (this was used in splash analysis, should probably be removed)
+minEnergyEB | 0.0 | add this to minimum energy threshold in EB (0.520 GeV)
+minEnergyEE | 0.0 | add this to minimum energy threshold in EE (which is a function of iRing)
+isSplash    |  0  | 0=false, 1=true, performs RECO as splash data and shifts timing in analyzer by TOF difference
+streamName | "AlCaPhiSym" | type of stream, changes RECO path: AlCaPhiSym or AlCaP0
+
+
+The script `scripts/testCAF.sh` automatically can run over RAW files for specific runs, setting the options above appropriately.
+Probably should use it as a template rather than running it as is. 
 */

EcalTiming/doc/instructions.doc

@@ -6,8 +6,9 @@ scram project CMSSW_7_4_2
 cd CMSSW_7_4_2/src
 cmsenv
 git cms-merge-topic shervin86:iRingInSubdet
-git clone  git@github.com:ECALELFS/EcalTiming.git
-git clone  git@github.com:ECALELFS/PhiSym.git
+git clone  git@github.com:previsualconsent/EcalTiming.git
+cd EcalTiming
+checkout energystability
 scram b -j16
 \endverbatim
 
@@ -33,4 +34,4 @@ cd -
 
 
 Go back to \ref index
-*/
+*/

EcalTiming/interface/EcalCrystalTimingCalibration.h

@@ -8,16 +8,13 @@
  * This class contains all the timing information for a single crystal
  */
 
-//Defines for Dump Status (reason for dumping each crystal
+//Defines for Dump Status (reason for dumping each crystal)
 #define DS_NONE         0x00
 #define DS_HIGH_SKEW    0x01
 #define DS_UNSTABLE_EN  0x02
 #define DS_CCU_OOT      0x04
-#define DS_EB_RING      0x08
-#define DS_EEm_RING     0x10
-#define DS_EEp_RING     0x20
-#define DS_EB_CRYS      0x40
-#define DS_EE_CRYS      0x80
+#define DS_RING         0x08
+#define DS_CRYS     		0x10
 
 
 class EcalCrystalTimingCalibration
@@ -33,9 +30,11 @@ class EcalCrystalTimingCalibration
 	unsigned long int _num; ///< number of timingEvents;
 
 	float _sumE; ///< scalar sum of the energy of each timingEvent: needed for average energy
+	bool _storingEvents;
+
+	mutable std::map<float, float> _sumWithinNSigma, _sum2WithinNSigma, _sum3WithinNSigma, _sumEWithinNSigma; ///< variables for calculation of mean, stdDev within n-times the origina stdDev (to remove tails)
+	mutable std::map<float, unsigned int> _numWithinNSigma; ///< variables for calculation of mean, stdDev within n-times the origina stdDev (to remove tails)
 
-	std::map<float, float> _sumWithinNSigma, _sum2WithinNSigma, _sum3WithinNSigma, _sumEWithinNSigma; ///< variables for calculation of mean, stdDev within n-times the origina stdDev (to remove tails)
-	std::map<float, unsigned int> _numWithinNSigma; ///< variables for calculation of mean, stdDev within n-times the origina stdDev (to remove tails)
 
 	std::vector<EcalTimingEvent> timingEvents; ///< vector containing  all the events for this crystal
 	std::vector<EcalTimingEvent>::iterator maxChi2Itr;
@@ -45,7 +44,7 @@ class EcalCrystalTimingCalibration
 	/// default constructor
 	EcalCrystalTimingCalibration(bool weightMean = true) :
 		//_detId(),
-		_sum(0), _sum2(0), _num(0), _sumE(0)
+		_sum(0), _sum2(0), _num(0), _sumE(0), _storingEvents(true)
 		//totalChi2(-1),
 		//useWeightedMean(weightMean)
 	{
@@ -57,6 +56,7 @@ class EcalCrystalTimingCalibration
 	};
 	inline float mean() const
 	{
+		if(!_num) return -999.f;
 		return _sum / _num;
 	}; ///< average time (mean of the time distribution)
 	inline float stdDev() const  ///< standard deviation of the time distribution
@@ -79,9 +79,11 @@ class EcalCrystalTimingCalibration
 	/* } */
 	//float totalChi2;
 
-	float getMeanWithinNSigma(float sigma, float maxRange); ///< returns the mean time within abs(mean+ n * stdDev) to reject tails
-	float getStdDevWithinNSigma(float sigma, float maxRange); ///< returns the stdDev calculated within abs(mean+ n * stdDev) to reject tails
-	float getSkewnessWithinNSigma(float sigma, float maxRange); ///< returns the skewness calculated within abs(mean+ n * stdDev) to reject tails
+	float getMeanWithinNSigma(float sigma, float maxRange) const; ///< returns the mean time within abs(mean+ n * stdDev) to reject tails
+	float getStdDevWithinNSigma(float sigma, float maxRange) const; ///< returns the stdDev calculated within abs(mean+ n * stdDev) to reject tails
+	float getNumWithinNSigma(float sigma, float maxRange) const; ///< returns the num calculated within abs(mean+ n * stdDev) to reject tails
+	float getMeanErrorWithinNSigma(float sigma, float maxRange) const; ///< returns the error on the mean calculated within abs(mean+ n * stdDev) to reject tails
+	float getSkewnessWithinNSigma(float sigma, float maxRange) const; ///< returns the skewness calculated within abs(mean+ n * stdDev) to reject tails
 
 	friend std::ostream& operator<< (std::ostream& os, const EcalCrystalTimingCalibration& s)
 	{
@@ -90,9 +92,9 @@ class EcalCrystalTimingCalibration
 	}
 
 	/// add new event for this crystal
-	inline bool add(EcalTimingEvent te_)
+	inline bool add(EcalTimingEvent te_, bool storeEvent = true)
 	{
-		return insertEvent(te_);
+		return insertEvent(te_,storeEvent);
 	}
 	inline void clear()
 	{
@@ -108,24 +110,27 @@ class EcalCrystalTimingCalibration
 		timingEvents.clear();
 	}
 
-	void dumpToTree(TTree *tree, int ix_, int iy_, int iz_, unsigned int status_, unsigned int elecID_ = 0); ///< dump the full set of events in a TTree:  need an empty tree
+	void dumpToTree(TTree *tree, int ix_, int iy_, int iz_, unsigned int status_, unsigned int elecID_, int iRing_); ///< dump the full set of events in a TTree:  need an empty tree
+	void dumpCalibToTree(TTree * tree, int rawid_, int ix_, int iy_, int iz_, unsigned int elecID_, int iRing_) const; ///< dump the callibratoin to the tree
 
 	/// checks if the time measurement is stable changing the min energy threshold
-	bool isStableInEnergy(float min, float max, float step);
+	bool isStableInEnergy(float min, float max, float step, std::vector< std::pair<float, EcalCrystalTimingCalibration*> > &ret);
 
 private:
-	void calcAllWithinNSigma(float n_sigma, float maxRange = 10); ///< calculate sum, sum2, sum3, n for time if time within n x stdDev and store the result
+	void calcAllWithinNSigma(float n_sigma, float maxRange = 10) const; ///< calculate sum, sum2, sum3, n for time if time within n x stdDev and store the result
 	// since the values are stored, the calculation is done only once with only one loop over the events
 
 	/// \todo weighted average by timeError
-	bool insertEvent(EcalTimingEvent te_)
+	bool insertEvent(EcalTimingEvent te_, bool storeEvent)
 	{
+		if(!storeEvent) _storingEvents = false;
 		if(te_.timeError() > 0 && te_.timeError() < 1000 && te_.timeError() < 3) { //exclude values with wrong timeError estimation
 			_sum += te_.time();
 			_sum2 += te_.time() * te_.time();
 			_sumE += te_.energy();
 			_num++;
-			timingEvents.push_back(te_);
+			if(_storingEvents)
+				timingEvents.push_back(te_);
 			//updateChi2();
 			return true;
 		} else {