ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/RateMonShiftTool_dev/DatabaseRateMonitor.py
Revision 1.79 - (view) (annotate) - [select for diffs]
Tue Dec 4 17:03:29 2012 UTC (12 years, 4 months ago) by awoodard
Branch: MAIN
CVS Tags: HEAD, V00-02-06
Changes since 1.78: +2 -2 lines
Diff to previous 1.78
Adding ShowAllBadRates to defaults.cfg and fixing bug in ShowAllBadRates

Revision 1.78 - (view) (annotate) - [select for diffs]
Mon Dec 3 17:24:35 2012 UTC (12 years, 4 months ago) by awoodard
Branch: MAIN
Changes since 1.77: +23 -12 lines
Diff to previous 1.77
Fixing bug using --RefRun argument with DoL1 enabled

Revision 1.77 - (view) (annotate) - [select for diffs]
Mon Dec 3 10:31:03 2012 UTC (12 years, 4 months ago) by awoodard
Branch: MAIN
Changes since 1.76: +1 -1 lines
Diff to previous 1.76
Fixing a bug which caused crash if there were nonsequential lumisections (physics went to undeclared and back again)

Revision 1.76 - (view) (annotate) - [select for diffs]
Fri Nov 30 18:59:32 2012 UTC (12 years, 5 months ago) by awoodard
Branch: MAIN
Changes since 1.75: +21 -23 lines
Diff to previous 1.75
fixing crash caused by low l1 rates

Revision 1.75 - (view) (annotate) - [select for diffs]
Fri Nov 30 00:47:22 2012 UTC (12 years, 5 months ago) by abrinke1
Branch: MAIN
Changes since 1.74: +1 -1 lines
Diff to previous 1.74
Corrected sigma to sigma_frac technique

Revision 1.74 - (view) (annotate) - [select for diffs]
Tue Nov 27 15:15:53 2012 UTC (12 years, 5 months ago) by awoodard
Branch: MAIN
Changes since 1.73: +25 -27 lines
Diff to previous 1.73
Fixing bug which causes crash when DoL1 is disabled; also, now prints rates for all L1 seeds of all bad HLT paths

Revision 1.73 - (view) (annotate) - [select for diffs]
Tue Nov 27 09:31:03 2012 UTC (12 years, 5 months ago) by awoodard
Branch: MAIN
Changes since 1.72: +5 -1 lines
Diff to previous 1.72
Fixing bug in comment width setting which caused script to crash if 100% deadtime

Revision 1.72 - (view) (annotate) - [select for diffs]
Mon Nov 26 17:31:57 2012 UTC (12 years, 5 months ago) by awoodard
Branch: MAIN
Changes since 1.71: +1 -14 lines
Diff to previous 1.71
fixing refrun option

Revision 1.71 - (view) (annotate) - [select for diffs]
Mon Nov 26 16:56:15 2012 UTC (12 years, 5 months ago) by awoodard
Branch: MAIN
Changes since 1.70: +50 -45 lines
Diff to previous 1.70
fixing refrun option

Revision 1.70 - (view) (annotate) - [select for diffs]
Mon Nov 26 07:49:36 2012 UTC (12 years, 5 months ago) by grchrist
Branch: MAIN
Changes since 1.69: +4 -3 lines
Diff to previous 1.69
L1 seeds being referenced before call when not in change by L1 seed mode

Revision 1.69 - (view) (annotate) - [select for diffs]
Thu Nov 22 10:53:10 2012 UTC (12 years, 5 months ago) by abrinke1
Branch: MAIN
Changes since 1.68: +35 -1 lines
Diff to previous 1.68
Now only displays L1 seeds for HLT seeds with warnings

Revision 1.68 - (view) (annotate) - [select for diffs]
Tue Nov 20 15:03:56 2012 UTC (12 years, 5 months ago) by grchrist
Branch: MAIN
Changes since 1.67: +18 -2 lines
Diff to previous 1.67
fit by L1seed change added to rate monitor

Revision 1.67 - (view) (annotate) - [select for diffs]
Tue Nov 20 13:30:48 2012 UTC (12 years, 5 months ago) by awoodard
Branch: MAIN
Changes since 1.66: +2 -2 lines
Diff to previous 1.66
bug fix

Revision 1.66 - (view) (annotate) - [select for diffs]
Tue Nov 20 11:23:39 2012 UTC (12 years, 5 months ago) by awoodard
Branch: MAIN
Changes since 1.65: +4 -6 lines
Diff to previous 1.65
bug fix

Revision 1.65 - (view) (annotate) - [select for diffs]
Fri Nov 16 13:58:27 2012 UTC (12 years, 5 months ago) by awoodard
Branch: MAIN
Changes since 1.64: +1 -0 lines
Diff to previous 1.64
Fixing bug which caused crash if sigma not found

Revision 1.64 - (view) (annotate) - [select for diffs]
Thu Nov 15 14:30:11 2012 UTC (12 years, 5 months ago) by awoodard
Branch: MAIN
Changes since 1.63: +29 -21 lines
Diff to previous 1.63
improving treatment of paths without fits; adding max # of bad paths to display

Revision 1.63 - (view) (annotate) - [select for diffs]
Tue Nov 6 10:07:51 2012 UTC (12 years, 5 months ago) by grchrist
Branch: MAIN
CVS Tags: V00-02-05
Changes since 1.62: +1 -1 lines
Diff to previous 1.62
modifications for usage, eg 20LS spike killing only for fitting

Revision 1.62 - (view) (annotate) - [select for diffs]
Fri Oct 19 14:01:55 2012 UTC (12 years, 6 months ago) by grchrist
Branch: MAIN
Changes since 1.61: +1 -1 lines
Diff to previous 1.61
removed ref run error message

Revision 1.61 - (view) (annotate) - [select for diffs]
Fri Oct 19 13:57:43 2012 UTC (12 years, 6 months ago) by grchrist
Branch: MAIN
Changes since 1.60: +6 -1 lines
Diff to previous 1.60
error message when source set.sh not used when running script

Revision 1.60 - (view) (annotate) - [select for diffs]
Thu Oct 18 11:42:44 2012 UTC (12 years, 6 months ago) by grchrist
Branch: MAIN
Changes since 1.59: +1 -1 lines
Diff to previous 1.59
Updates for deployment at P5 and added parking list

Revision 1.59 - (view) (annotate) - [select for diffs]
Thu Oct 4 08:46:50 2012 UTC (12 years, 6 months ago) by grchrist
Branch: MAIN
CVS Tags: V00-02-04
Changes since 1.58: +4 -3 lines
Diff to previous 1.58
L1 rates bug in shifter mode fixed

Revision 1.58 - (view) (annotate) - [select for diffs]
Wed Oct 3 12:06:10 2012 UTC (12 years, 6 months ago) by grchrist
Branch: MAIN
CVS Tags: V00-02-03
Changes since 1.57: +1 -1 lines
Diff to previous 1.57
trying to get new run warning changed to blue

Revision 1.57 - (view) (annotate) - [select for diffs]
Wed Oct 3 11:36:09 2012 UTC (12 years, 6 months ago) by grchrist
Branch: MAIN
Changes since 1.56: +1 -3 lines
Diff to previous 1.56
changes for P5 deployment

Revision 1.56 - (view) (annotate) - [select for diffs]
Wed Sep 26 22:12:48 2012 UTC (12 years, 7 months ago) by grchrist
Branch: MAIN
Changes since 1.55: +19 -0 lines
Diff to previous 1.55
added L1 monitoring to rate monitoring

Revision 1.55 - (view) (annotate) - [select for diffs]
Tue Sep 11 16:51:18 2012 UTC (12 years, 7 months ago) by awoodard
Branch: MAIN
CVS Tags: V00-02-01
Changes since 1.54: +24 -4 lines
Diff to previous 1.54
If lumisections are skipped, now only averages luminosity over the most recent sequential lumisections.

Revision 1.54 - (view) (annotate) - [select for diffs]
Thu Aug 23 17:21:44 2012 UTC (12 years, 8 months ago) by awoodard
Branch: MAIN
Changes since 1.53: +1 -1 lines
Diff to previous 1.53
bug fix

Revision 1.53 - (view) (annotate) - [select for diffs]
Thu Aug 23 17:18:46 2012 UTC (12 years, 8 months ago) by awoodard
Branch: MAIN
Changes since 1.52: +2 -1 lines
Diff to previous 1.52
bug fix

Revision 1.52 - (view) (annotate) - [select for diffs]
Thu Aug 23 16:58:30 2012 UTC (12 years, 8 months ago) by awoodard
Branch: MAIN
CVS Tags: V-00-01-10, V00-01-10
Changes since 1.51: +7 -8 lines
Diff to previous 1.51
fixing bug in rate mon sigma calculation

Revision 1.51 - (view) (annotate) - [select for diffs]
Wed Aug 22 16:28:48 2012 UTC (12 years, 8 months ago) by awoodard
Branch: MAIN
CVS Tags: V00-01-09
Changes since 1.50: +44 -47 lines
Diff to previous 1.50
Adding '--ShowAllBadRates' option

Revision 1.50 - (view) (annotate) - [select for diffs]
Thu Aug 9 14:07:07 2012 UTC (12 years, 8 months ago) by muell149
Branch: MAIN
CVS Tags: V00-01-08
Changes since 1.49: +9 -4 lines
Diff to previous 1.49
added option to write to csv

Revision 1.49 - (view) (annotate) - [select for diffs]
Thu Aug 9 12:03:26 2012 UTC (12 years, 8 months ago) by awoodard
Branch: MAIN
CVS Tags: V00-01-07
Changes since 1.48: +18 -51 lines
Diff to previous 1.48
Adding warning based on fit to stream a

Revision 1.48 - (view) (annotate) - [select for diffs]
Thu Aug 9 08:59:21 2012 UTC (12 years, 8 months ago) by muell149
Branch: MAIN
CVS Tags: V00-01-06
Changes since 1.47: +7 -2 lines
Diff to previous 1.47
updated module to work with menu comparison script

Revision 1.47 - (view) (annotate) - [select for diffs]
Fri Jul 20 13:05:14 2012 UTC (12 years, 9 months ago) by awoodard
Branch: MAIN
CVS Tags: V00-01-04, V00-01-05
Changes since 1.46: +11 -6 lines
Diff to previous 1.46
Adding option to show sigma and percent error in rate monitor table

Revision 1.46 - (view) (annotate) - [select for diffs]
Fri Jul 20 12:11:15 2012 UTC (12 years, 9 months ago) by awoodard
Branch: MAIN
CVS Tags: V00-01-03
Changes since 1.45: +6 -3 lines
Diff to previous 1.45
Adding configuration option to choose whether to warn on percent difference or sigma difference

Revision 1.45 - (view) (annotate) - [select for diffs]
Fri Jul 20 11:00:07 2012 UTC (12 years, 9 months ago) by awoodard
Branch: MAIN
CVS Tags: V00-01-02
Changes since 1.44: +5 -6 lines
Diff to previous 1.44
Changing rate table to only show the sigma deviation, and not percent difference

Revision 1.44 - (view) (annotate) - [select for diffs]
Fri Jul 20 10:01:21 2012 UTC (12 years, 9 months ago) by awoodard
Branch: MAIN
CVS Tags: V00-01-01
Changes since 1.43: +48 -33 lines
Diff to previous 1.43
Updating error calculation to use Chi2 error instead of percent difference for RateMonitor

Revision 1.43 - (view) (annotate) - [select for diffs]
Tue Jul 17 15:12:27 2012 UTC (12 years, 9 months ago) by grchrist
Branch: MAIN
CVS Tags: V00-00-33, V00-00-34
Changes since 1.42: +33 -23 lines
Diff to previous 1.42
log monitoring, tier0 warnings, correct prompt stream A rate

Revision 1.42 - (view) (annotate) - [select for diffs]
Mon Jul 16 09:15:33 2012 UTC (12 years, 9 months ago) by grchrist
Branch: MAIN
Changes since 1.41: +12 -12 lines
Diff to previous 1.41
now does all fits, fixed bug in reconstruction of expo fits

Revision 1.41 - (view) (annotate) - [select for diffs]
Fri Jul 13 11:55:04 2012 UTC (12 years, 9 months ago) by grchrist
Branch: MAIN
Changes since 1.40: +19 -15 lines
Diff to previous 1.40
requiring stable beams bu fixed

Revision 1.40 - (view) (annotate) - [select for diffs]
Fri Jul 13 11:27:10 2012 UTC (12 years, 9 months ago) by grchrist
Branch: MAIN
Changes since 1.39: +7 -1 lines
Diff to previous 1.39
stable beams needed before printint rates

Revision 1.39 - (view) (annotate) - [select for diffs]
Wed Jul 4 08:22:46 2012 UTC (12 years, 9 months ago) by grchrist
Branch: MAIN
CVS Tags: MenuAnalyzer_V00-00-01, MenuAnalyzer_V00-00-02, MenuAnalyzer_V1
Changes since 1.38: +8 -0 lines
Diff to previous 1.38
message to add warning to call HLT doc

Revision 1.38 - (view) (annotate) - [select for diffs]
Mon Jul 2 12:48:31 2012 UTC (12 years, 10 months ago) by grchrist
Branch: MAIN
Changes since 1.37: +0 -2 lines
Diff to previous 1.37
fixes to printouts and min express

Revision 1.37 - (view) (annotate) - [select for diffs]
Mon Jul 2 10:04:04 2012 UTC (12 years, 10 months ago) by grchrist
Branch: MAIN
Changes since 1.36: +10 -2 lines
Diff to previous 1.36
fixed zero expected rate and lt zero expected rate bug

Revision 1.36 - (view) (annotate) - [select for diffs]
Tue May 22 11:06:14 2012 UTC (12 years, 11 months ago) by grchrist
Branch: MAIN
Changes since 1.35: +5 -3 lines
Diff to previous 1.35
latest lists

Revision 1.35 - (view) (annotate) - [select for diffs]
Tue Apr 17 20:26:04 2012 UTC (13 years ago) by grchrist
Branch: MAIN
CVS Tags: V00-00-31, V00-00-32
Changes since 1.34: +5 -2 lines
Diff to previous 1.34
No Version cleaned up

Revision 1.34 - (view) (annotate) - [select for diffs]
Tue Apr 17 19:45:36 2012 UTC (13 years ago) by grchrist
Branch: MAIN
CVS Tags: V00-00-30
Changes since 1.33: +52 -26 lines
Diff to previous 1.33
ref run back

Revision 1.33 - (view) (annotate) - [select for diffs]
Sun Apr 15 11:16:30 2012 UTC (13 years ago) by amott
Branch: MAIN
CVS Tags: V00-00-29
Changes since 1.32: +41 -37 lines
Diff to previous 1.32
Added ability to sort the output list and fixed bugs so we can list all triggers

Revision 1.32 - (view) (annotate) - [select for diffs]
Fri Apr 13 09:47:36 2012 UTC (13 years ago) by grchrist
Branch: MAIN
Changes since 1.31: +5 -2 lines
Diff to previous 1.31
bug fixes in predictor and monitor, mkTMDfits

Revision 1.31 - (view) (annotate) - [select for diffs]
Tue Apr 10 08:45:14 2012 UTC (13 years ago) by grchrist
Branch: MAIN
CVS Tags: V00-00-26, V00-00-27, V00-00-28
Changes since 1.30: +3 -4 lines
Diff to previous 1.30
removed some comments

Revision 1.30 - (view) (annotate) - [select for diffs]
Tue Apr 10 08:23:41 2012 UTC (13 years ago) by grchrist
Branch: MAIN
Changes since 1.29: +40 -11 lines
Diff to previous 1.29
No version mode put back into Rate Monitoring

Revision 1.29 - (view) (annotate) - [select for diffs]
Mon Apr 9 10:53:10 2012 UTC (13 years ago) by grchrist
Branch: MAIN
Changes since 1.28: +1 -1 lines
Diff to previous 1.28
latest and greated fit file

Revision 1.28 - (view) (annotate) - [select for diffs]
Sat Apr 7 10:21:57 2012 UTC (13 years ago) by grchrist
Branch: MAIN
Changes since 1.27: +1 -1 lines
Diff to previous 1.27
added option to make linear fits of rate in RatePredictor, added the linear fit file

Revision 1.27 - (view) (annotate) - [select for diffs]
Thu Apr 5 22:51:47 2012 UTC (13 years ago) by grchrist
Branch: MAIN
Changes since 1.26: +5 -3 lines
Diff to previous 1.26
more changes

Revision 1.26 - (view) (annotate) - [select for diffs]
Thu Apr 5 14:17:17 2012 UTC (13 years ago) by grchrist
Branch: MAIN
Changes since 1.25: +7 -3 lines
Diff to previous 1.25
latest predictions

Revision 1.25 - (view) (annotate) - [select for diffs]
Thu Apr 5 11:01:37 2012 UTC (13 years ago) by grchrist
Branch: MAIN
Changes since 1.24: +10 -8 lines
Diff to previous 1.24
more error modes and increased stream A threshold to 1600 Hz (for this week)

Revision 1.24 - (view) (annotate) - [select for diffs]
Thu Apr 5 06:13:40 2012 UTC (13 years ago) by grchrist
Branch: MAIN
Changes since 1.23: +9 -5 lines
Diff to previous 1.23
masked L1 predictions for now

Revision 1.23 - (view) (annotate) - [select for diffs]
Thu Apr 5 05:03:24 2012 UTC (13 years ago) by grchrist
Branch: MAIN
Changes since 1.22: +136 -45 lines
Diff to previous 1.22
rate monitoring should run on 2012 fine

Revision 1.22 - (view) (annotate) - [select for diffs]
Wed Apr 4 08:57:55 2012 UTC (13 years ago) by grchrist
Branch: MAIN
Changes since 1.21: +15 -4 lines
Diff to previous 1.21
put an exception message in GetLatestRunNumber where there is no trigger key

Revision 1.21 - (view) (annotate) - [select for diffs]
Tue Apr 3 18:50:10 2012 UTC (13 years ago) by grchrist
Branch: MAIN
Changes since 1.20: +1 -0 lines
Diff to previous 1.20
preparations for 2012 collisions

Revision 1.20 - (view) (annotate) - [select for diffs]
Tue Apr 3 13:25:47 2012 UTC (13 years, 1 month ago) by grchrist
Branch: MAIN
Changes since 1.19: +13 -7 lines
Diff to previous 1.19
changed year=2011 to global var called thisyear

Revision 1.19 - (view) (annotate) - [select for diffs]
Fri Mar 30 08:46:54 2012 UTC (13 years, 1 month ago) by grchrist
Branch: MAIN
CVS Tags: V00-00-24
Changes since 1.18: +7 -6 lines
Diff to previous 1.18
removed strip version from RateMonitoring, will need long term fix for this problem

Revision 1.18 - (view) (annotate) - [select for diffs]
Mon Mar 26 15:50:19 2012 UTC (13 years, 1 month ago) by grchrist
Branch: MAIN
CVS Tags: V00-00-21, V00-00-22, V00-00-23
Changes since 1.17: +11 -4 lines
Diff to previous 1.17
changed the fit ref file, and now RMonitoring is with deadtimebeamactive from db

Revision 1.17 - (view) (annotate) - [select for diffs]
Thu Mar 22 21:59:30 2012 UTC (13 years, 1 month ago) by amott
Branch: MAIN
CVS Tags: V00-00-19, V00-00-20
Changes since 1.16: +10 -8 lines
Diff to previous 1.16
fixed bug preventing new run from being noticed

Revision 1.16 - (view) (annotate) - [select for diffs]
Mon Mar 12 16:48:37 2012 UTC (13 years, 1 month ago) by amott
Branch: MAIN
CVS Tags: V00-00-15, V00-00-16, V00-00-17, V00-00-18
Changes since 1.15: +21 -14 lines
Diff to previous 1.15
Modified to allow monitoring of Cosmics

Revision 1.15 - (view) (annotate) - [select for diffs]
Fri Mar 9 09:00:31 2012 UTC (13 years, 1 month ago) by amott
Branch: MAIN
CVS Tags: V00-00-13, V00-00-14
Changes since 1.14: +9 -9 lines
Diff to previous 1.14
Added express stream monitoring and tweaked interface

Revision 1.14 - (view) (annotate) - [select for diffs]
Thu Mar 8 12:41:29 2012 UTC (13 years, 1 month ago) by grchrist
Branch: MAIN
Changes since 1.13: +2 -2 lines
Diff to previous 1.13
now draws triggers from list, change of pkl in RateMonitor, new function (not yet called) to get additional lumi info in DataBaseParser

Revision 1.13 - (view) (annotate) - [select for diffs]
Wed Mar 7 14:39:45 2012 UTC (13 years, 1 month ago) by grchrist
Branch: MAIN
CVS Tags: V00-00-10, V00-00-11, V00-00-12
Changes since 1.12: +1 -1 lines
Diff to previous 1.12
pointed to new .pkl in RatePredictor and relaxed AllowedRateDiff in RateMonitor

Revision 1.12 - (view) (annotate) - [select for diffs]
Wed Mar 7 13:18:37 2012 UTC (13 years, 1 month ago) by grchrist
Branch: MAIN
Changes since 1.11: +10 -3 lines
Diff to previous 1.11
now ignoring paths not in the .list unless we specify ListIgnoredPaths

Revision 1.11 - (view) (annotate) - [select for diffs]
Wed Mar 7 12:44:36 2012 UTC (13 years, 1 month ago) by grchrist
Branch: MAIN
Changes since 1.10: +2 -2 lines
Diff to previous 1.10
pointed the pkl files in cvs to the real fiels

Revision 1.10 - (view) (annotate) - [select for diffs]
Wed Mar 7 12:07:41 2012 UTC (13 years, 1 month ago) by abrinke1
Branch: MAIN
CVS Tags: V00-00-09
Changes since 1.9: +0 -15 lines
Diff to previous 1.9
Removed conflict notation

Revision 1.9 - (view) (annotate) - [select for diffs]
Wed Mar 7 11:57:23 2012 UTC (13 years, 1 month ago) by abrinke1
Branch: MAIN
Changes since 1.8: +37 -4 lines
Diff to previous 1.8
Now uses Database fits and RefRuns to compare

Revision 1.8 - (view) (annotate) - [select for diffs]
Wed Mar 7 08:09:27 2012 UTC (13 years, 1 month ago) by amott
Branch: MAIN
Changes since 1.7: +2 -2 lines
Diff to previous 1.7
Added back in the last PS Col functionality

Revision 1.7 - (view) (annotate) - [select for diffs]
Fri Mar 2 09:28:13 2012 UTC (13 years, 2 months ago) by grchrist
Branch: MAIN
CVS Tags: V00-00-08
Changes since 1.6: +2 -1 lines
Diff to previous 1.6
made everything run so we can use this version for beta secondardy shifter training

Revision 1.6 - (view) (annotate) - [select for diffs]
Mon Feb 27 11:12:59 2012 UTC (13 years, 2 months ago) by grchrist
Branch: MAIN
CVS Tags: V00-00-07
Changes since 1.5: +3 -2 lines
Diff to previous 1.5
removed LastPS and relaxed allowed rate diff

Revision 1.5 - (view) (annotate) - [select for diffs]
Thu Feb 16 16:38:34 2012 UTC (13 years, 2 months ago) by amott
Branch: MAIN
CVS Tags: V00-00-05
Branch point for: V00-00-06
Changes since 1.4: +1 -1 lines
Diff to previous 1.4
Update to ReadConfig and added code to point to the PS column

Revision 1.4 - (view) (annotate) - [select for diffs]
Thu Feb 16 16:25:57 2012 UTC (13 years, 2 months ago) by amott
Branch: MAIN
Changes since 1.3: +1 -1 lines
Diff to previous 1.3
Added ability to predict L1 rates

Revision 1.3 - (view) (annotate) - [select for diffs]
Wed Feb 15 20:00:15 2012 UTC (13 years, 2 months ago) by abrinke1
Branch: MAIN
CVS Tags: V00-00-04
Changes since 1.2: +17 -15 lines
Diff to previous 1.2
Slight change uses accurate ps info

Revision 1.2 - (view) (annotate) - [select for diffs]
Wed Feb 15 09:55:46 2012 UTC (13 years, 2 months ago) by amott
Branch: MAIN
CVS Tags: V00-00-01, V00-00-02, V00-00-03
Changes since 1.1: +15 -10 lines
Diff to previous 1.1
bug fix

Revision 1.1 - (view) (annotate) - [select for diffs]
Mon Feb 13 19:33:53 2012 UTC (13 years, 2 months ago) by amott
Branch: MAIN
first working version

Convenience Links

Links to HEAD: (view) (annotate) Links to HEAD: (view) (annotate)

Compare Revisions

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.

  Diffs between and
  Type of Diff should be a